cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

final cleanup

Browse Source
This commit is contained in:
SinTwo
2016-07-18 16:03:53 -04:00
parent 918e65b7b9
commit cf45a827a9
8 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
code/game/objects/structures/bedsheet_bin.dm
View File

@@ -9,7 +9,6 @@ LINEN BINS
desc = "A surprisingly soft linen bedsheet."
icon = 'icons/obj/items.dmi'
icon_state = "sheet"
item_state = "bedsheet"
slot_flags = SLOT_BACK
layer = 4.0
throwforce = 1
@@ -39,140 +38,123 @@ LINEN BINS
/obj/item/weapon/bedsheet/blue
icon_state = "sheetblue"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/green
icon_state = "sheetgreen"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/orange
icon_state = "sheetorange"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/purple
icon_state = "sheetpurple"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/rainbow
icon_state = "sheetrainbow"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/red
icon_state = "sheetred"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/yellow
icon_state = "sheetyellow"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/mime
icon_state = "sheetmime"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/clown
icon_state = "sheetclown"
item_state = "bedsheet"
item_state = "sheetrainbow"
/obj/item/weapon/bedsheet/captain
icon_state = "sheetcaptain"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/rd
icon_state = "sheetrd"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/medical
icon_state = "sheetmedical"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/hos
icon_state = "sheethos"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/hop
icon_state = "sheethop"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/ce
icon_state = "sheetce"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/brown
icon_state = "sheetbrown"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/ian
icon_state = "sheetian"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/double
icon_state = "doublesheet"
item_state = "bedsheet"
item_state = "sheet"
/obj/item/weapon/bedsheet/bluedouble
icon_state = "doublesheetblue"
item_state = "bedsheet"
item_state = "sheetblue"
/obj/item/weapon/bedsheet/greendouble
icon_state = "doublesheetgreen"
item_state = "bedsheet"
item_state = "sheetgreen"
/obj/item/weapon/bedsheet/orangedouble
icon_state = "doublesheetorange"
item_state = "bedsheet"
item_state = "sheetorange"
/obj/item/weapon/bedsheet/purpledouble
icon_state = "doublesheetpurple"
item_state = "bedsheet"
item_state = "sheetpurple"
/obj/item/weapon/bedsheet/doublerainbow //all the way across the sky.
/obj/item/weapon/bedsheet/rainbowdouble //all the way across the sky.
icon_state = "doublesheetrainbow"
item_state = "bedsheet"
item_state = "sheetrainbow"
/obj/item/weapon/bedsheet/doublered
/obj/item/weapon/bedsheet/reddouble
icon_state = "doublesheetred"
item_state = "bedsheet"
item_state = "sheetred"
/obj/item/weapon/bedsheet/doubleyellow
/obj/item/weapon/bedsheet/yellowdouble
icon_state = "doublesheetyellow"
item_state = "bedsheet"
item_state = "sheetyellow"
/obj/item/weapon/bedsheet/doublemime
/obj/item/weapon/bedsheet/mimedouble
icon_state = "doublesheetmime"
item_state = "bedsheet"
item_state = "sheetmime"
/obj/item/weapon/bedsheet/doubleclown
/obj/item/weapon/bedsheet/clowndouble
icon_state = "doublesheetclown"
item_state = "bedsheet"
item_state = "sheetrainbow"
/obj/item/weapon/bedsheet/doublecaptain
/obj/item/weapon/bedsheet/captaindouble
icon_state = "doublesheetcaptain"
item_state = "bedsheet"
item_state = "sheetcaptain"
/obj/item/weapon/bedsheet/doublerd
/obj/item/weapon/bedsheet/rddouble
icon_state = "doublesheetrd"
item_state = "bedsheet"
item_state = "sheetrd"
/obj/item/weapon/bedsheet/doublehos
/obj/item/weapon/bedsheet/hosdouble
icon_state = "doublesheethos"
item_state = "bedsheet"
item_state = "sheethos"
/obj/item/weapon/bedsheet/doublehop
/obj/item/weapon/bedsheet/hopdouble
icon_state = "doublesheethop"
item_state = "bedsheet"
item_state = "sheethop"
/obj/item/weapon/bedsheet/doublece
/obj/item/weapon/bedsheet/cedouble
icon_state = "doublesheetce"
item_state = "bedsheet"
item_state = "sheetce"
/obj/item/weapon/bedsheet/doublebrown
/obj/item/weapon/bedsheet/browndouble
icon_state = "doublesheetbrown"
item_state = "bedsheet"
item_state = "sheetbrown"
/obj/item/weapon/bedsheet/doubleian
/obj/item/weapon/bedsheet/iandouble
icon_state = "doublesheetian"
item_state = "bedsheet"
item_state = "sheetian"
/obj/structure/bedsheetbin
name = "linen bin"

BIN
icons/mob/head.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 144 KiB

BIN
icons/mob/items/lefthand.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 45 KiB

BIN
icons/mob/items/righthand.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
icons/mob/suit.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 398 KiB

After

Width:  |  Height:  |  Size: 392 KiB

BIN
icons/obj/clothing/hats.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 67 KiB

BIN
icons/obj/clothing/suits.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 144 KiB

After

Width:  |  Height:  |  Size: 139 KiB

8
maps/polaris-1.dmm
View File

@@ -1328,8 +1328,8 @@
"azB" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_7)
"azC" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8)
"azD" = (/obj/machinery/light_switch{pixel_x = 0; pixel_y = -27},/obj/machinery/light_switch{pixel_x = 0; pixel_y = -27},/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash)
"azE" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/doublebrown,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5)
"azF" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/doublebrown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6)
"azE" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/browndouble,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5)
"azF" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6)
"azG" = (/turf/space,/area/syndicate_station/northwest)
"azH" = (/turf/simulated/floor/tiled,/area/security/security_equiptment_storage)
"azI" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage)
@@ -1353,7 +1353,7 @@
"aAa" = (/obj/machinery/atmospherics/valve,/turf/simulated/floor,/area/security/riot_control)
"aAb" = (/turf/simulated/floor,/area/security/riot_control)
"aAc" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor,/area/security/riot_control)
"aAd" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/doublebrown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11)
"aAd" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11)
"aAe" = (/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Door"; opacity = 0},/turf/simulated/floor,/area/maintenance/security_starboard)
"aAf" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor,/area/maintenance/security_starboard)
"aAg" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/maintenance/security_starboard)
@@ -1379,7 +1379,7 @@
"aAA" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/chapel_hallway)
"aAB" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/secondary/chapel_hallway)
"aAC" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/chapel_hallway)
"aAD" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/doublebrown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12)
"aAD" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12)
"aAE" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5)
"aAF" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6)
"aAG" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11)