cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 22:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a bug with stationary turrets. Removes quotes in path-name to ensure type always exists. Includes code review suggestions.

Browse Source
This commit is contained in:
PsiOmega
2014-10-23 20:55:10 +02:00
parent 8fa9a7ab39
commit a49fd52732
6 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/inventory.dm
View File

@@ -181,7 +181,7 @@
update_inv_wear_mask(0)
return
/mob/proc/unEquip(obj/item/I, force) //Force overrides NODROP for things like wizarditis and admin undress.
/mob/proc/unEquip(obj/item/I, force = 0) //Force overrides NODROP for things like wizarditis and admin undress.
if(!I) //If there's nothing to drop, the drop is automatically successful. If(unEquip) should generally be used to check for NODROP.
return 1

9
code/modules/mob/mob_helpers.dm
View File

@@ -10,6 +10,15 @@
return 1
return 0
/proc/isxenomorph(A)
if(isalien(A))
return 1
if(istype(A, /mob/living/carbon))
var/mob/living/carbon/C = A
var/xeno = "Xenomorph"
return findtext(C.species.name, xeno, 0, lentext(xeno))
return 0
/proc/ismonkey(A)
if(A && istype(A, /mob/living/carbon/monkey))
return 1