cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into nanoui-is-dead

Browse Source
This commit is contained in:
AffectedArc07
2020-11-26 09:34:14 +00:00
committed by GitHub
parent afa8d97288 e859088889
commit 44012814d0
70 changed files with 719 additions and 1906 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+16 -5
View File
@@ -72,24 +72,35 @@
/obj/structure/closet/jcloset/New()
..()
new /obj/item/clothing/under/rank/janitor(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/cartridge/janitor(src)
new /obj/item/flashlight(src)
new /obj/item/flashlight(src)
new /obj/item/melee/flyswatter(src)
new /obj/item/melee/flyswatter(src)
new /obj/item/clothing/shoes/galoshes(src)
new /obj/item/clothing/shoes/galoshes(src)
new /obj/item/soap(src)
new /obj/item/soap(src)
new /obj/item/reagent_containers/spray/cleaner(src)
new /obj/item/caution(src)
new /obj/item/caution(src)
new /obj/item/caution(src)
new /obj/item/caution(src)
new /obj/item/storage/bag/trash(src)
new /obj/item/storage/bag/trash(src)
new /obj/item/lightreplacer(src)
new /obj/item/lightreplacer(src)
new /obj/item/holosign_creator(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/head/soft/purple(src)
new /obj/item/holosign_creator(src)
new /obj/item/watertank/janitor(src)
new /obj/item/watertank/janitor(src)
new /obj/item/storage/belt/janitor(src)
new /obj/item/storage/belt/janitor(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/head/soft/purple(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/clothing/under/rank/janitor(src)
new /obj/item/cartridge/janitor(src)
/*
* Lawyer
code/game/objects/structures/flora.dm
+3
View File
@@ -50,6 +50,7 @@
name = "grass"
icon = 'icons/obj/flora/snowflora.dmi'
anchored = 1
max_integrity = 15
/obj/structure/flora/grass/brown
icon_state = "snowgrass1bb"
@@ -80,6 +81,7 @@
icon = 'icons/obj/flora/snowflora.dmi'
icon_state = "snowbush1"
anchored = 1
max_integrity = 15
/obj/structure/flora/bush/New()
..()
@@ -92,6 +94,7 @@
icon = 'icons/obj/flora/ausflora.dmi'
icon_state = "firstbush_1"
anchored = 1
max_integrity = 15
/obj/structure/flora/ausbushes/New()
..()
code/game/objects/structures/tables_racks.dm
+4
View File
@@ -71,6 +71,10 @@
base = "rtable"
if(istype(src, /obj/structure/table/wood/poker))
base = "poker"
if(istype(src, /obj/structure/table/wood/fancy))
base = "fancy"
if(istype(src, /obj/structure/table/wood/fancy/black))
base = "fancyblack"
icon_state = "[base]flip[type][type == 1 ? subtype : ""]"