cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2903 from fauxki/bleeding-edge-freeze

Browse Source 
DON'T MERGE - BEF - Bar / Holodeck / Theatre / Hydroponics Revamp
This commit is contained in:
Chinsky
2013-06-03 01:59:33 -07:00
parent a37cc877c0 f367d7de19
commit abc2e6b96b
6 changed files with 316 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/game/area/Space Station 13 areas.dm
View File

@@ -867,6 +867,24 @@ proc/process_ghost_teleport_locs()
/area/holodeck/source_wildlife
name = "\improper Holodeck - Wildlife Simulation"
/area/holodeck/source_meetinghall
name = "\improper Holodeck - Meeting Hall"
/area/holodeck/source_theatre
name = "\improper Holodeck - Theatre"
/area/holodeck/source_picnicarea
name = "\improper Holodeck - Picnic Area"
/area/holodeck/source_snowfield
name = "\improper Holodeck - Snow Field"
/area/holodeck/source_desert
name = "\improper Holodeck - Desert"
/area/holodeck/source_space
name = "\improper Holodeck - Space"

11
code/game/machinery/computer/HolodeckControl.dm
View File

@@ -32,6 +32,12 @@
dat += "<A href='?src=\ref[src];basketball=1'>((Basketball Court)</font>)</A><BR>"
dat += "<A href='?src=\ref[src];thunderdomecourt=1'>((Thunderdome Court)</font>)</A><BR>"
dat += "<A href='?src=\ref[src];beach=1'>((Beach)</font>)</A><BR>"
dat += "<A href='?src=\ref[src];desert=1'>((Desert)</font>)</A><BR>"
dat += "<A href='?src=\ref[src];space=1'>((Space)</font>)</A><BR>"
dat += "<A href='?src=\ref[src];picnicarea=1'>((Picnic Area)</font>)</A><BR>"
dat += "<A href='?src=\ref[src];snowfield=1'>((Snow Field)</font>)</A><BR>"
dat += "<A href='?src=\ref[src];theatre=1'>((Theatre)</font>)</A><BR>"
dat += "<A href='?src=\ref[src];meetinghall=1'>((Meeting Hall)</font>)</A><BR>"
// dat += "<A href='?src=\ref[src];turnoff=1'>((Shutdown System)</font>)</A><BR>"
dat += "Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded.<BR>"
@@ -417,6 +423,11 @@
if(isrobot(user))
return
/obj/structure/table/holotable/wood
name = "table"
desc = "A square piece of wood standing on four wooden legs. It can not move."
icon = 'icons/obj/structures.dmi'
icon_state = "wood_table"
/obj/item/clothing/gloves/boxing/hologlove

2
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -26,8 +26,6 @@
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/dispatch(src)
new /obj/item/clothing/under/rank/dispatch(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/jackboots(src)