New job! Barber and salon! (#8756)

* Oh hi Mark.

* hand dryer 4000

* E

* fur dyer

* actually makes it work

* Update fur_dyer.dm

* Update fur_dyer.dm

* Final touches!

* Update jobs.txt

* le straight razor

* f

* Update hhmirror.dm

* updoot

* Update IceBoxStation_skyrat.dmm

* E

* No more failure penalties, it's bad.

* logic errors

* actual hairdye

* Update barber.dm

* Rebases to newer map versions

Fixes multiple issues with the original map changes in this PR, which are as follows but not limited to:
• Trapping Lawyers in their office on Blueshift
• Incorrect curtain types
• Awkward atmos
• Broken disposals
• Missing wallmounts
• Missing firelocks

* camera on meta

* Update jobs.dm

* more dyesprays

Co-authored-by: Kat <evesovereign@hotmail.co.uk>
This commit is contained in:
Gandalf
2021-10-18 13:11:11 +13:00
committed by GitHub
co-authored by Kat
parent e0bb4d4786
commit d095ec38a8
39 changed files with 5719 additions and 5086 deletions
+2 -2
View File
@@ -138,13 +138,13 @@
desc = "The most important thing you could possibly spend your hard-earned money on."
cost = PAYCHECK_EASY * 4
contains = list(/obj/item/toy/plush/beeplushie)
/* SKYRAT EDIT REMOVAL
/datum/supply_pack/goody/dyespray
name = "Hair Dye Spray"
desc = "A cool spray to dye your hair with awesome colors!"
cost = PAYCHECK_EASY * 2
contains = list(/obj/item/dyespray)
*/
/datum/supply_pack/goody/beach_ball
name = "Beach Ball"
// uses desc from item
-1
View File
@@ -26,7 +26,6 @@
/obj/item/skillchip/ceramic_master = 2,
/obj/item/skillchip/fishing_master = 2,
/obj/item/skillchip/useless_adapter=5,
/obj/item/dyespray=3,
/obj/item/razor=3,
)
//SKYRAT EDIT: Adds Ceramic, Glassblowing, and Fishing Skillchips