shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Alternative Miner Suits (#7611)

Browse Source 
* haha what the fuck this took like a solid 6 hours

* allows new suits to spawn on legion corpses.

* Update flags.dm

* Fix conflict maybe

* pls work

* im a big gay
This commit is contained in:
nik707
2018-10-03 22:32:25 -05:00
committed by kevinz000
parent 344c09644e
commit 595d4c3504
11 changed files with 102 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+8 -1
View File
@@ -184,7 +184,14 @@
if((!QDELETED(spawner) && spawner.faction_check_mob(L)) || L.stat == DEAD)
continue
visible_message("<span class='danger'>[src] grabs hold of [L]!</span>")
L.Stun(100)
var/mob/living/carbon/C = L
var/obj/item/clothing/S = C.get_item_by_slot(SLOT_WEAR_SUIT)
if(S && S.resistance_flags & GOLIATH_RESISTANCE)
L.Stun(75)
else if(S && S.resistance_flags & GOLIATH_WEAKNESS)
L.Stun(125)
else
L.Stun(100)
L.adjustBruteLoss(rand(10,15))
latched = TRUE
if(!latched)
code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+1 -1
View File
@@ -289,7 +289,7 @@
gloves = /obj/item/clothing/gloves/color/black
mask = /obj/item/clothing/mask/gas/explorer
if(prob(20))
suit = pickweight(list(/obj/item/clothing/suit/hooded/explorer = 18, /obj/item/clothing/suit/hooded/cloak/goliath = 2))
suit = pickweight(list(/obj/item/clothing/suit/hooded/explorer = 6, /obj/item/clothing/suit/hooded/cloak/goliath = 2, /obj/item/clothing/suit/hooded/exo = 6, /obj/item/clothing/suit/hooded/seva = 6))
if(prob(30))
r_pocket = pickweight(list(/obj/item/stack/marker_beacon = 20, /obj/item/stack/spacecash/c1000 = 7, /obj/item/reagent_containers/hypospray/medipen/survival = 2, /obj/item/borg/upgrade/modkit/damage = 1 ))
if(prob(10))