Skip to content

Commit

Permalink
Зажигалки для командного состава (#84)
Browse files Browse the repository at this point in the history
* Added 12 new icons

6 new zippos for head ("on" & "off")

* Added 6 new models

6 new zippos

* Add 10 new items on the map

6 new zippo models and 4 cigarette packs

* Add 11 new items

6 new zippos and 5 cigarette packs

* Add files via upload

* Add files via upload

* Added 6 new items to command loadout

Added 6 new zippos to Captain, HoP, HoS, RD, CMO, CE
  • Loading branch information
AttHawk authored Jul 3, 2021
1 parent 5acfca3 commit 132083d
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/game/jobs/job/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
head = /obj/item/clothing/head/hardhat/white
l_ear = /obj/item/radio/headset/heads/ce
id = /obj/item/card/id/ce
l_pocket = /obj/item/t_scanner
l_pocket = /obj/item/lighter/zippo/ce
r_pocket = /obj/item/t_scanner
pda = /obj/item/pda/heads/ce
backpack_contents = list(
/obj/item/melee/classic_baton/telescopic = 1
Expand Down
1 change: 1 addition & 0 deletions code/game/jobs/job/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/radio/headset/heads/cmo
id = /obj/item/card/id/cmo
l_pocket = /obj/item/lighter/zippo/cmo
suit_store = /obj/item/flashlight/pen
l_hand = /obj/item/storage/firstaid/doctor
pda = /obj/item/pda/heads/cmo
Expand Down
1 change: 1 addition & 0 deletions code/game/jobs/job/science.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/radio/headset/heads/rd
id = /obj/item/card/id/rd
l_pocket = /obj/item/lighter/zippo/rd
l_hand = /obj/item/clipboard
pda = /obj/item/pda/heads/rd
backpack_contents = list(
Expand Down
1 change: 1 addition & 0 deletions code/game/jobs/job/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
l_ear = /obj/item/radio/headset/heads/hos/alt
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
id = /obj/item/card/id/hos
l_pocket = /obj/item/lighter/zippo/hos
suit_store = /obj/item/gun/energy/gun
pda = /obj/item/pda/heads/hos
l_hand = /obj/item/storage/lockbox/sibyl_system_mod
Expand Down
2 changes: 2 additions & 0 deletions code/game/jobs/job/supervisor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
l_ear = /obj/item/radio/headset/heads/captain/alt
glasses = /obj/item/clothing/glasses/hud/skills/sunglasses
id = /obj/item/card/id/gold
l_pocket = /obj/item/lighter/zippo/cap
pda = /obj/item/pda/captain
backpack_contents = list(
/obj/item/storage/box/ids = 1,
Expand Down Expand Up @@ -94,6 +95,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
glasses = /obj/item/clothing/glasses/hud/skills/sunglasses
l_ear = /obj/item/radio/headset/heads/hop
id = /obj/item/card/id/silver
l_pocket = /obj/item/lighter/zippo/hop
pda = /obj/item/pda/heads/hop
backpack_contents = list(
/obj/item/storage/box/ids = 1,
Expand Down
42 changes: 42 additions & 0 deletions code/game/objects/items/weapons/lighters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,48 @@
icon_on = "gonzozippoon"
icon_off = "gonzozippo"

/obj/item/lighter/zippo/cap
name = "Captain's zippo"
desc = "A limited edition gold Zippo espesially for NT Captains. Looks extremely expensive."
icon_state = "zippo_cap"
icon_on = "zippo_cap_on"
icon_off = "zippo_cap"

/obj/item/lighter/zippo/hop
name = "Head of personnel zippo"
desc = "A limited edition Zippo for NT Heads. Tries it best to look like captain's."
icon_state = "zippo_hop"
icon_on = "zippo_hop_on"
icon_off = "zippo_hop"

/obj/item/lighter/zippo/hos
name = "Head of Security zippo"
desc = "A limited edition Zippo for NT Heads. Fuel it with clown's tears."
icon_state = "zippo_hos"
icon_on = "zippo_hos_on"
icon_off = "zippo_hos"

/obj/item/lighter/zippo/cmo
name = "Chief Medical Officer zippo"
desc = "A limited edition Zippo for NT Heads. Made of hypoallergenic steel."
icon_state = "zippo_cmo"
icon_on = "zippo_cmo_on"
icon_off = "zippo_cmo"

/obj/item/lighter/zippo/ce
name = "Chief Engineer zippo"
desc = "A limited edition Zippo for NT Heads. Somebody've tried to repair cover with blue tape."
icon_state = "zippo_ce"
icon_on = "zippo_ce_on"
icon_off = "zippo_ce"

/obj/item/lighter/zippo/rd
name = "Research Director zippo"
desc = "A limited edition Zippo for NT Heads. Uses advanced tech to make fire from plasma."
icon_state = "zippo_rd"
icon_on = "zippo_rd_on"
icon_off = "zippo_rd"

///////////
//MATCHES//
///////////
Expand Down
Binary file modified icons/obj/items.dmi
Binary file not shown.

0 comments on commit 132083d

Please sign in to comment.