Alot of stuff.

This commit is contained in:
quotefox
2019-10-07 03:13:23 +01:00
parent 65741c826c
commit 515daa39bd
13 changed files with 87 additions and 39 deletions
@@ -6,6 +6,8 @@
var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
var/mergeable_decal = TRUE //when two of these are on a same tile or do we need to merge them into just one?
/obj/effect/decal/cleanable/Initialize(mapload, list/datum/disease/diseases)
. = ..()
if (random_icon_states && (icon_state == initial(icon_state)) && length(random_icon_states) > 0)
@@ -60,6 +60,8 @@
desc = "A sign labelling a restroom."
icon_state = "restroom"
/obj/structure/sign/departments/medbay
name = "\improper MEDBAY"
desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here."
@@ -187,6 +187,14 @@
icon = 'icons/turf/walls/rusty_wall.dmi'
hardness = 45
/obj/effect/decal/walldivider
name = "wall divider"
desc = "To make things look neat"
icon = 'icons/obj/decals.dmi'
icon_state = "walldiv"
/turf/closed/wall/r_wall/rust
name = "rusted reinforced wall"
desc = "A huge chunk of rusted reinforced metal."
+29
View File
@@ -46,3 +46,32 @@
riding_datum.force_dismount(M)
else
R.unbuckle_all_mobs()
/datum/emote/speen
key = "speen"
key_third_person = "speeeeens!"
restraint_check = TRUE
mob_type_allowed_typecache = list(/mob/living, /mob/dead/observer)
mob_type_ignore_stat_typecache = list(/mob/dead/observer)
/datum/emote/speen/run_emote(mob/user)
. = ..()
if(.)
user.spin(20, 1)
if(iscyborg(user) && user.has_buckled_mobs())
var/mob/living/silicon/robot/R = user
GET_COMPONENT_FROM(riding_datum, /datum/component/riding, R)
if(riding_datum)
for(var/mob/M in R.buckled_mobs)
riding_datum.force_dismount(M)
else
R.unbuckle_all_mobs()
/datum/emote/speen/run_emote(mob/living/user, params)
if(ishuman(user))
if(user.nextsoundemote >= world.time)
return
user.nextsoundemote = world.time + 7
playsound(user, 'modular_citadel/sound/voice/speen.ogg', 50, 1, -1)
. = ..()
+1
View File
@@ -285,3 +285,4 @@
/obj/effect/decal/hammerandsickle/shuttleRotate(rotation)
setDir(angle2dir(rotation+dir2angle(dir))) // No parentcall, rest of the rotate code breaks the pixel offset.