mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-22 04:36:53 +01:00
Xenofauna map update. (#9135)
* Repaths badges, ribbons, pins and permits to /medal. * Drakes can now wear pride pins. * Updates xenofauna map, repaths some accessories. * Added fence door interaction for drakes (open but not close) * Adds stasis cages to the Xenofauna lab. * Corrects some Cynosure badge paths. * Allows mobs to climb into stasis cages themselves. * Added lower temperature sensor alarms to xenofauna.
This commit is contained in:
@@ -1518,7 +1518,7 @@
|
||||
var/braintype = get_FBP_type()
|
||||
if(braintype == FBP_DRONE)
|
||||
var/turf/T = get_turf(src)
|
||||
var/obj/item/clothing/accessory/permit/drone/permit = new(T)
|
||||
var/obj/item/clothing/accessory/medal/permit/drone/permit = new(T)
|
||||
permit.set_name(real_name)
|
||||
equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor.
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
if(!A || suit.loc != src || !(A in suit.accessories))
|
||||
return
|
||||
|
||||
if(istype(A, /obj/item/clothing/accessory/badge) || istype(A, /obj/item/clothing/accessory/medal))
|
||||
if(istype(A, /obj/item/clothing/accessory/medal/badge) || istype(A, /obj/item/clothing/accessory/medal))
|
||||
user.visible_message("<span class='danger'>\The [user] tears off \the [A] from [src]'s [suit.name]!</span>")
|
||||
add_attack_logs(user,src,"Stripped [A.name] off [suit.name]")
|
||||
A.on_removed(user)
|
||||
@@ -67,7 +67,7 @@
|
||||
var/obj/item/grab/grab = held
|
||||
if(istype(grab) && grab.affecting == src)
|
||||
stripping = TRUE
|
||||
|
||||
|
||||
if(stripping)
|
||||
if(!istype(target_slot)) // They aren't holding anything valid and there's nothing to remove, why are we even here?
|
||||
return
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
var/const/ATTACHED_ARMOR = "armor plate"
|
||||
var/const/ATTACHED_LIGHT = "light"
|
||||
var/const/ATTACHED_ID = "access card"
|
||||
var/const/ATTACHED_TAG = "tag"
|
||||
|
||||
/// Contains valid types that the harness will attach to.
|
||||
var/list/harnessable_types
|
||||
|
||||
+2
-1
@@ -19,7 +19,8 @@
|
||||
/obj/item/storage/animal_harness/grafadreka/proc/UpdateArmor
|
||||
),
|
||||
/obj/item/card/id = ATTACHED_ID,
|
||||
/obj/item/flashlight = ATTACHED_LIGHT
|
||||
/obj/item/flashlight = ATTACHED_LIGHT,
|
||||
/obj/item/clothing/accessory/medal = ATTACHED_TAG
|
||||
)
|
||||
|
||||
|
||||
|
||||
+8
@@ -13,6 +13,14 @@
|
||||
Open()
|
||||
|
||||
|
||||
/obj/structure/fence/door/interaction_grafadreka(mob/living/simple_mob/animal/sif/grafadreka/drake)
|
||||
. = TRUE
|
||||
if (drake.a_intent == I_HURT)
|
||||
return ..()
|
||||
if (!open && !locked)
|
||||
toggle(drake)
|
||||
|
||||
|
||||
/obj/structure/loot_pile/interaction_grafadreka(mob/living/simple_mob/animal/sif/grafadreka/drake)
|
||||
. = TRUE
|
||||
if (drake.a_intent == I_HURT)
|
||||
|
||||
Reference in New Issue
Block a user