cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

People are now hidden behind smoke (#24229)

Browse Source 
* no, that is NOT solid snake

* lol

* more names

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/belt.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Contrabang
2024-03-11 14:13:59 -04:00
committed by GitHub
parent e32544e599
commit 3557748229
9 changed files with 127 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/headset.dm
+3
View File
@@ -349,6 +349,9 @@
/obj/item/radio/headset/ert/alt/solgov
name = "\improper Trans-Solar Federation Marine's bowman headset"
/obj/item/radio/headset/ert/alt/solgovviper
name = "\improper Trans-Solar Federation Infiltrator's bowman headset"
/obj/item/radio/headset/ert/alt/commander
name = "ERT commander's bowman headset"
desc = "The headset of the boss. Protects ears from flashbangs. Can transmit even if telecomms are down."
code/game/objects/items/weapons/storage/belt.dm
+23 -4
View File
@@ -67,11 +67,11 @@
if(!M.restrained() && !M.stat && can_use())
switch(over_object.name)
if("r_hand")
M.unEquip(src, silent = TRUE)
M.put_in_r_hand(src)
if(M.unEquip(src, silent = TRUE))
M.put_in_r_hand(src)
if("l_hand")
M.unEquip(src, silent = TRUE)
M.put_in_l_hand(src)
if(M.unEquip(src, silent = TRUE))
M.put_in_l_hand(src)
add_fingerprint(usr)
return
@@ -504,6 +504,25 @@
new /obj/item/grenade/plastic/c4/thermite(src)
update_icon()
/obj/item/storage/belt/viper
name = "utility belt"
desc = "Holds smokebombs, bolas, and knives. Excellent for sneaking around."
icon_state = "securitybelt"
item_state = "security"
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 18
can_hold = list(
/obj/item/grenade/smokebomb,
/obj/item/restraints/legcuffs/bola,
/obj/item/kitchen/knife/combat
)
/obj/item/storage/belt/viper/populate_contents()
for(var/I in 1 to 5)
new /obj/item/grenade/smokebomb(src)
new /obj/item/restraints/legcuffs/bola(src)
new /obj/item/restraints/legcuffs/bola(src)
/obj/item/storage/belt/janitor
name = "janibelt"
desc = "A belt used to hold most janitorial supplies."
code/game/objects/items/weapons/storage/boxes.dm
+9 -9
View File
@@ -250,15 +250,6 @@
for(var/I in 1 to 7)
new /obj/item/ammo_casing/shotgun/tranquilizer(src)
/obj/item/storage/box/flashbangs
name = "box of flashbangs (WARNING)"
desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</B>"
icon_state = "flashbang"
/obj/item/storage/box/flashbangs/populate_contents()
for(var/I in 1 to 7)
new /obj/item/grenade/flashbang(src)
/obj/item/storage/box/flashes
name = "box of flashbulbs"
desc = "<B>WARNING: Flashes can cause serious eye damage, protective eyewear is required.</B>"
@@ -648,6 +639,15 @@
for(var/I in 1 to 7)
new /obj/item/grenade/flashbang(src)
/obj/item/storage/box/smoke_grenades
name = "smoke grenades"
desc = "A box with 7 smoke grenades."
icon_state = "teargas_box"
/obj/item/storage/box/smoke_grenades/populate_contents()
for(var/I in 1 to 7)
new /obj/item/grenade/smokebomb(src)
/obj/item/storage/box/flashes
name = "box of flashbulbs"
desc = "<B>WARNING: Flashes can cause serious eye damage, protective eyewear is required.</B>"