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

normalization

Browse Source
This commit is contained in:
Tupinambis
2020-10-01 18:46:31 -05:00
parent a2fbd76a49
commit d2860b38c7
31 changed files with 205 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spiderperson_web.dm → code/game/objects/effects/arachnid_web.dm
+12 -12
View File
@@ -1,4 +1,4 @@
/obj/structure/spider_player
/obj/structure/arachnid
name = "large web"
icon = 'icons/effects/effects.dmi'
desc = "It's stringy and sticky, but the threads are larger than what spiderlings could produce."
@@ -6,16 +6,16 @@
density = FALSE
max_integrity = 20
/obj/structure/spider_player/New()
/obj/structure/arachnid/New()
..()
icon_state = pick(list("stickyweb1", "stickyweb2"))
/obj/structure/spider_player/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
/obj/structure/arachnid/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
if(damage_type == BURN)//the stickiness of the web mutes all attack sounds except fire damage type
playsound(loc, 'sound/items/welder.ogg', 100, TRUE)
/obj/structure/spider_player/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
/obj/structure/arachnid/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
if(damage_flag == "melee")
switch(damage_type)
if(BURN)
@@ -24,24 +24,24 @@
damage_amount *= 0.5
. = ..()
/obj/structure/spider_player/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
/obj/structure/arachnid/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300)
take_damage(5, BURN, 0, 0)
/obj/structure/spider_player/CanPass(atom/movable/mover, turf/target)
/obj/structure/arachnid/CanPass(atom/movable/mover, turf/target)
. = ..()
if(isspiderperson(mover))
if(isarachnid(mover))
return TRUE
else if(isliving(mover))
if(isspiderperson(mover.pulledby))
if(isarachnid(mover.pulledby))
return TRUE
if(prob(20))
to_chat(mover, "<span class='danger'>You get stuck in \the [src] for a moment.</span>")
return FALSE
/obj/structure/spider_player/cocoon
/obj/structure/arachnid/cocoon
name = "cocoon"
desc = "Something wrapped in silky spider web."
icon_state = "cocoon1"
@@ -49,11 +49,11 @@
density = FALSE
max_integrity = 60
/obj/structure/spider_player/cocoon/Initialize()
/obj/structure/arachnid/cocoon/Initialize()
icon_state = pick("cocoon1","cocoon2","cocoon3")
. = ..()
/obj/structure/spider_player/cocoon/container_resist(mob/living/user)
/obj/structure/arachnid/cocoon/container_resist(mob/living/user)
var/breakout_time = 150 // DECI not DECA ffs
to_chat(user, "<span class='notice'>You struggle against the tight bonds... (This will take about [DisplayTimeText(breakout_time)].)</span>")
visible_message("<span class='notice'>You see something struggling and writhing in \the [src]!</span>")
@@ -62,7 +62,7 @@
return
qdel(src)
/obj/structure/spider_player/cocoon/Destroy()
/obj/structure/arachnid/cocoon/Destroy()
var/turf/T = get_turf(src)
src.visible_message("<span class='warning'>\The [src] splits open.</span>")
for(var/atom/movable/A in contents)