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

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'

Browse Source
This commit is contained in:
KasparoVy
2015-12-30 18:16:17 -05:00
parent 135475332b 58ad640d17
commit eb47c80d75
66 changed files with 328 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spiders.dm
+1 -1
View File
@@ -198,7 +198,7 @@
S.faction = faction
S.master_commander = master_commander
if(player_spiders)
var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
var/list/candidates = get_candidates(ROLE_ALIEN, ALIEN_AFK_BRACKET)
var/client/C = null
if(candidates.len)
code/game/objects/items/weapons/storage/uplink_kits.dm
+11
View File
@@ -150,6 +150,17 @@
new /obj/item/clothing/head/helmet/space/rig/syndi(src)
return
/obj/item/weapon/storage/box/syndie_kit/elite_hardsuit
name = "Boxed Elite Syndicate Hardsuit and Helmet"
can_hold = list("/obj/item/clothing/suit/space/rig/syndi/elite", "/obj/item/clothing/head/helmet/space/rig/syndi/elite")
max_w_class = 3
/obj/item/weapon/storage/box/syndie_kit/elite_hardsuit/New()
..()
new /obj/item/clothing/suit/space/rig/syndi/elite(src)
new /obj/item/clothing/head/helmet/space/rig/syndi/elite(src)
return
/obj/item/weapon/storage/box/syndie_kit/conversion
name = "box (CK)"