cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compile

Browse Source
This commit is contained in:
Artur
2020-06-22 21:30:54 +03:00
parent aff4e5f93f
commit a02e6ab03e
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mapping/minimaps.dm
View File

@@ -75,7 +75,6 @@
//we're done baking, now we ship it.
register_asset("minimap-[id].png", map_icon)
register_asset("minimap-[id]-meta.png", meta_icon)
send_asset_list(user, list("minimap-[id].png" = map_icon, "minimap-[id]-meta.png" = meta_icon))
/datum/minimap/proc/send(mob/user)
if(!id)

10
code/modules/mob/transform_procs.dm
View File

@@ -1,7 +1,7 @@
#define TRANSFORMATION_DURATION 22
/mob/living/carbon/proc/monkeyize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_DEFAULTMSG))
if (notransform || transformation_timer)
if(mob_transforming || transformation_timer)
return
if(tr_flags & TR_KEEPITEMS)
@@ -11,7 +11,7 @@
dropItemToGround(W)
//Make mob invisible and spawn animation
notransform = TRUE
mob_transforming = TRUE
Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
icon = null
cut_overlays()
@@ -156,7 +156,7 @@
//Could probably be merged with monkeyize but other transformations got their own procs, too
/mob/living/carbon/proc/humanize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_DEFAULTMSG))
if (notransform || transformation_timer)
if (mob_transforming || transformation_timer)
return
//now the rest
@@ -169,7 +169,7 @@
client.screen -= W
//Make mob invisible and spawn animation
notransform = TRUE
mob_transforming = TRUE
Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
icon = null
@@ -362,7 +362,7 @@
qdel(src)
/mob/living/carbon/human/proc/Robotize(delete_items = 0, transfer_after = TRUE)
if (mob_transforming)
if(mob_transforming)
return
for(var/obj/item/W in src)
if(delete_items)