cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor C4, subtypes, and airlock ex_act (#16995)

Browse Source 
* Refactor C4 and Airlock ex_act

* update uplink desc

* Replace ismob by carbon, clarify comment

* remove unnecessary ismob check

* replace destroy by qdel, fix comment

* auto doc comments, add else condition

* Add comment to shaped c4

* Shortens shaped boom proc, make airlocks more resistant against light ex
This commit is contained in:
datlo
2021-11-05 10:12:09 +01:00
committed by GitHub
parent 640a20878a
commit d94210031b
10 changed files with 59 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/striketeam.dm
+1 -1
View File
@@ -188,7 +188,7 @@ GLOBAL_VAR_INIT(sent_strike_team, 0)
if(is_leader)
equip_to_slot_or_del(new /obj/item/disk/nuclear/unrestricted(src), slot_in_backpack)
else
equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber(src), slot_l_store)
code/modules/admin/verbs/striketeam_syndicate.dm
+2 -2
View File
@@ -140,12 +140,12 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0)
equip_to_slot_or_del(new /obj/item/gun/projectile/revolver(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/ammo_box/a357(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), slot_in_backpack)
if(is_leader)
equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/disk/nuclear/unrestricted(src), slot_in_backpack)
else
equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/card/emag(src), slot_r_store)
equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber/red(src), slot_l_store)