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

Conflicts!!!

Browse Source
This commit is contained in:
Artur
2020-06-22 17:39:24 +03:00
parent 66cbdd1174 a0a4007332
commit c41d2e78be
395 changed files with 84463 additions and 336540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/transform_procs.dm
+15 -15
View File
@@ -313,7 +313,7 @@
qdel(src)
/mob/living/carbon/human/AIize()
if (notransform)
if (mob_transforming)
return
for(var/t in bodyparts)
qdel(t)
@@ -321,12 +321,12 @@
return ..()
/mob/living/carbon/AIize()
if(notransform)
if(mob_transforming)
return
for(var/obj/item/W in src)
dropItemToGround(W)
regenerate_icons()
notransform = TRUE
mob_transforming = TRUE
Paralyze(INFINITY)
icon = null
invisibility = INVISIBILITY_MAXIMUM
@@ -362,7 +362,7 @@
qdel(src)
/mob/living/carbon/human/proc/Robotize(delete_items = 0, transfer_after = TRUE)
if (notransform)
if (mob_transforming)
return
for(var/obj/item/W in src)
if(delete_items)
@@ -370,7 +370,7 @@
else
dropItemToGround(W)
regenerate_icons()
notransform = TRUE
mob_transforming = TRUE
Paralyze(INFINITY)
icon = null
invisibility = INVISIBILITY_MAXIMUM
@@ -407,12 +407,12 @@
//human -> alien
/mob/living/carbon/human/proc/Alienize(mind_transfer = TRUE)
if (notransform)
if (mob_transforming)
return
for(var/obj/item/W in src)
dropItemToGround(W)
regenerate_icons()
notransform = 1
mob_transforming = 1
Paralyze(INFINITY)
icon = null
invisibility = INVISIBILITY_MAXIMUM
@@ -441,12 +441,12 @@
qdel(src)
/mob/living/carbon/human/proc/slimeize(reproduce, mind_transfer = TRUE)
if (notransform)
if (mob_transforming)
return
for(var/obj/item/W in src)
dropItemToGround(W)
regenerate_icons()
notransform = 1
mob_transforming = 1
Paralyze(INFINITY)
icon = null
invisibility = INVISIBILITY_MAXIMUM
@@ -486,12 +486,12 @@
/mob/living/carbon/human/proc/corgize(mind_transfer = TRUE)
if (notransform)
if (mob_transforming)
return
for(var/obj/item/W in src)
dropItemToGround(W)
regenerate_icons()
notransform = TRUE
mob_transforming = TRUE
Paralyze(INFINITY)
icon = null
invisibility = INVISIBILITY_MAXIMUM
@@ -510,7 +510,7 @@
qdel(src)
/mob/living/carbon/proc/gorillize(mind_transfer = TRUE)
if(notransform)
if(mob_transforming)
return
SSblackbox.record_feedback("amount", "gorillas_created", 1)
@@ -521,7 +521,7 @@
dropItemToGround(W, TRUE)
regenerate_icons()
notransform = TRUE
mob_transforming = TRUE
Paralyze(INFINITY)
icon = null
invisibility = INVISIBILITY_MAXIMUM
@@ -544,13 +544,13 @@
if(mind)
mind_transfer = alert("Want to transfer their mind into the new mob", "Mind Transfer", "Yes", "No") == "Yes" ? TRUE : FALSE
if(notransform)
if(mob_transforming)
return
for(var/obj/item/W in src)
dropItemToGround(W)
regenerate_icons()
notransform = TRUE
mob_transforming = TRUE
Paralyze(INFINITY)
icon = null
invisibility = INVISIBILITY_MAXIMUM