cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2903 from Aurorablade/OrganRefactor

Browse Source 
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
This commit is contained in:
Fox McCloud
2016-03-04 19:51:50 -05:00
parent 47bfb28df1 fe3eb50b5e
commit ab490f7fd9
138 changed files with 4384 additions and 2426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1
View File
@@ -186,6 +186,7 @@
new /obj/item/weapon/storage/belt/medical(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/reagent_containers/hypospray/CMO(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
return
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+3 -3
View File
@@ -16,7 +16,7 @@
if(buckled_mob && buckled_mob.buckled == src)
var/mob/living/M = buckled_mob
if(isalien(user))
if(user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel))
unbuckle_mob()
add_fingerprint(user)
return
@@ -50,9 +50,9 @@
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
return
if(isalien(M))
if(M.get_int_organ(/obj/item/organ/internal/alien/plasmavessel))
return
if(!isalien(user))
if(!user.get_int_organ(/obj/item/organ/internal/alien/plasmavessel))
return
unbuckle_mob()