mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Removed the /TG/ "feature" which has explosions insta-gib dead people. THIS IS WHY I HATE THE MERGE.
This commit is contained in:
@@ -73,15 +73,6 @@
|
|||||||
if(!blinded)
|
if(!blinded)
|
||||||
flick("flash", flash)
|
flick("flash", flash)
|
||||||
|
|
||||||
if (stat == 2 && client)
|
|
||||||
gib()
|
|
||||||
return
|
|
||||||
|
|
||||||
else if (stat == 2 && !client)
|
|
||||||
xgibs(loc, viruses)
|
|
||||||
del(src)
|
|
||||||
return
|
|
||||||
|
|
||||||
var/shielded = 0
|
var/shielded = 0
|
||||||
|
|
||||||
var/b_loss = null
|
var/b_loss = null
|
||||||
|
|||||||
@@ -70,15 +70,6 @@
|
|||||||
if(!blinded)
|
if(!blinded)
|
||||||
flick("flash", flash)
|
flick("flash", flash)
|
||||||
|
|
||||||
if (stat == 2 && client)
|
|
||||||
gib()
|
|
||||||
return
|
|
||||||
|
|
||||||
else if (stat == 2 && !client)
|
|
||||||
gibs(loc, viruses)
|
|
||||||
del(src)
|
|
||||||
return
|
|
||||||
|
|
||||||
var/b_loss = null
|
var/b_loss = null
|
||||||
var/f_loss = null
|
var/f_loss = null
|
||||||
switch (severity)
|
switch (severity)
|
||||||
|
|||||||
@@ -228,18 +228,6 @@
|
|||||||
if(!blinded)
|
if(!blinded)
|
||||||
flick("flash", flash)
|
flick("flash", flash)
|
||||||
|
|
||||||
// /obj/item/clothing/suit/bomb_suit(src)
|
|
||||||
// /obj/item/clothing/head/bomb_hood(src)
|
|
||||||
|
|
||||||
if (stat == 2 && client)
|
|
||||||
gib()
|
|
||||||
return
|
|
||||||
|
|
||||||
else if (stat == 2 && !client)
|
|
||||||
gibs(loc, viruses)
|
|
||||||
del(src)
|
|
||||||
return
|
|
||||||
|
|
||||||
var/shielded = 0
|
var/shielded = 0
|
||||||
var/b_loss = null
|
var/b_loss = null
|
||||||
var/f_loss = null
|
var/f_loss = null
|
||||||
|
|||||||
@@ -201,13 +201,6 @@
|
|||||||
|
|
||||||
/mob/living/carbon/metroid/ex_act(severity)
|
/mob/living/carbon/metroid/ex_act(severity)
|
||||||
|
|
||||||
if (stat == 2 && client)
|
|
||||||
return
|
|
||||||
|
|
||||||
else if (stat == 2 && !client)
|
|
||||||
del(src)
|
|
||||||
return
|
|
||||||
|
|
||||||
var/b_loss = null
|
var/b_loss = null
|
||||||
var/f_loss = null
|
var/f_loss = null
|
||||||
switch (severity)
|
switch (severity)
|
||||||
|
|||||||
@@ -477,14 +477,7 @@
|
|||||||
/mob/living/carbon/monkey/ex_act(severity)
|
/mob/living/carbon/monkey/ex_act(severity)
|
||||||
if(!blinded)
|
if(!blinded)
|
||||||
flick("flash", flash)
|
flick("flash", flash)
|
||||||
if (stat == 2 && client)
|
|
||||||
gib()
|
|
||||||
return
|
|
||||||
|
|
||||||
if (stat == 2 && !client)
|
|
||||||
gibs(loc, viruses)
|
|
||||||
del(src)
|
|
||||||
return
|
|
||||||
switch(severity)
|
switch(severity)
|
||||||
if(1.0)
|
if(1.0)
|
||||||
if (stat != 2)
|
if (stat != 2)
|
||||||
|
|||||||
@@ -277,14 +277,6 @@
|
|||||||
if(!blinded)
|
if(!blinded)
|
||||||
flick("flash", flash)
|
flick("flash", flash)
|
||||||
|
|
||||||
if (stat == 2 && client)
|
|
||||||
gib()
|
|
||||||
return
|
|
||||||
|
|
||||||
else if (stat == 2 && !client)
|
|
||||||
del(src)
|
|
||||||
return
|
|
||||||
|
|
||||||
switch(severity)
|
switch(severity)
|
||||||
if(1.0)
|
if(1.0)
|
||||||
if (stat != 2)
|
if (stat != 2)
|
||||||
|
|||||||
Reference in New Issue
Block a user