Fixes running around causing mental issues and more (#4169)

-fixes #4168
-fixes #4165
-fixes #4161
-fixes a missing facial hair
-fixes flags on the warehouse
-fixes a message with rings
-removes the badges from the maint spawn as some player's request
This commit is contained in:
Alberyk
2018-01-28 00:16:55 +02:00
committed by Erki
parent bfb8a336db
commit eefbc5fc1a
7 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -68,6 +68,7 @@ var/list/engineering_positions = list(
"Chief Engineer",
"Station Engineer",
"Atmospheric Technician",
"Janitor",
"Engineering Apprentice"
)
@@ -104,7 +105,6 @@ var/list/civilian_positions = list(
"Bartender",
"Gardener",
"Chef",
"Janitor",
"Librarian",
"Chaplain",
"Assistant"
-2
View File
@@ -676,8 +676,6 @@
/obj/item/clothing/under/syndicate/tracksuit = 0.2,
/obj/item/clothing/under/rank/clown = 0.1,
/obj/item/clothing/under/mime = 0.1,
/obj/item/clothing/accessory/badge = 0.2,
/obj/item/clothing/accessory/badge/old = 0.2,
/obj/item/clothing/accessory/storage/webbing = 0.6,
/obj/item/clothing/accessory/storage/knifeharness = 0.3,
/obj/item/clothing/head/collectable/petehat = 0.1,
+2
View File
@@ -1161,6 +1161,8 @@ var/list/global/random_stock_large = list(
allsigns -= typesof(/obj/structure/sign/poster)
allsigns -= /obj/structure/sign/directions
allsigns -= typesof(/obj/structure/sign/christmas)
allsigns -= typesof(/obj/structure/sign/flag)
var/number = rand(1,5)
while (number > 0)
+2 -2
View File
@@ -59,10 +59,10 @@
/obj/item/clothing/ring/seal/signet/attack_self(mob/user)
if(nameset)
to_chat(user, "<span class='notice'>The [src] has already been claimed!</span>")
to_chat(user, "<span class='notice'>\The [src] has already been claimed!</span>")
return
to_chat(user, "<span class='notice'>You claim the [src] as your own!</span>")
to_chat(user, "<span class='notice'>You claim \the [src] as your own!</span>")
change_name(user)
nameset = 1
@@ -215,7 +215,7 @@
oxyloss = 0
else
amount = amount*species.oxy_mod
if(getOxyLoss() + amount >= config.health_threshold_crit) //start taking brain damage if they go into crit from oxyloss
if(getOxyLoss() + amount >= abs(config.health_threshold_crit)) //start taking brain damage if they go into crit from oxyloss
adjustBrainLoss(amount,55) //this brain damage won't be lethal)
..(amount)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 20 KiB