Merge remote-tracking branch 'citadel/master' into tgsync

This commit is contained in:
silicons
2021-01-09 14:56:32 -08:00
39 changed files with 211 additions and 65 deletions
@@ -18,6 +18,7 @@
/obj/item/paicard/Initialize()
SSpai.pai_card_list += src
add_overlay("pai-off")
AddElement(/datum/element/bed_tuckable, 6, -5, 90)
return ..()
/obj/item/paicard/Destroy()
+1
View File
@@ -48,6 +48,7 @@
/obj/item/toy/plush/Initialize(mapload, set_snowflake_id)
. = ..()
AddComponent(/datum/component/squeak, squeak_override)
AddElement(/datum/element/bed_tuckable, 6, -5, 90)
//have we decided if Pinocchio goes in the blue or pink aisle yet?
if(gender == NEUTER)
+3 -1
View File
@@ -326,6 +326,9 @@
else if(istype(W, /obj/item/borg/upgrade/ai))
var/obj/item/borg/upgrade/ai/M = W
if(check_completion())
if(!chest.cell)
to_chat(user, "<span class='warning'>The endoskeleton still needs a power cell!</span>")
return
if(!isturf(loc))
to_chat(user, "<span class='warning'>You cannot install[M], the frame has to be standing on the ground to be perfectly precise!</span>")
return
@@ -346,7 +349,6 @@
O.lawupdate = FALSE
O.make_laws()
O.cell = chest.cell
chest.cell.forceMove(O)
chest.cell = null