mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
Removed water balloons from the arcade, on Urist-chan's orders~
Updated oldstation and uterus to use the new chair paths. Removed tgstation.3.0.0.dmm, as the main mappers have no intentions to complete it. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3149 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
@@ -139,7 +139,7 @@
|
||||
emagged = 0
|
||||
|
||||
else if(!contents.len)
|
||||
var/prizeselect = pick(1,2,3,4,5,6,7,8,9,10)
|
||||
var/prizeselect = pick(1,2,3,4,5,6,7,8,9)
|
||||
switch(prizeselect)
|
||||
if(1)
|
||||
new /obj/item/toy/snappopbox(src.loc)
|
||||
@@ -161,8 +161,8 @@
|
||||
new /obj/item/weapon/storage/crayonbox(src.loc)
|
||||
if(9)
|
||||
new /obj/item/toy/spinningtoy(src.loc)
|
||||
if(10)
|
||||
new /obj/item/toy/balloon(src.loc)
|
||||
// if(10) //Commented out on Urist-chan's orders~
|
||||
// new /obj/item/toy/balloon(src.loc) //Until it gets a better sprite~
|
||||
else
|
||||
var/atom/movable/Prize = pick(contents)
|
||||
Prize.loc = src.loc
|
||||
|
||||
+21
-21
@@ -239,13 +239,13 @@
|
||||
"eE" = (/obj/machinery/computer/card,/turf/simulated/floor,/area/engine/engineering)
|
||||
"eF" = (/obj/structure/window/reinforced{dir = 5},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/floor/engine,/area/engine/engineering)
|
||||
"eG" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor,/area/engine/engineering)
|
||||
"eH" = (/obj/structure/stool/chair{dir = 1},/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eH" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eI" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eJ" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table,/obj/item/weapon/pen,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eK" = (/obj/machinery/igniter,/turf/simulated/floor/engine,/area/engine/engineering)
|
||||
"eL" = (/obj/machinery/door/window/southright,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eM" = (/obj/structure/window/reinforced{dir = 5},/obj/item/weapon/extinguisher,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eN" = (/obj/structure/stool/chair{dir = 4},/obj/effect/landmark/start{name = "Research Director"},/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eN" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Research Director"},/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eO" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/device/assembly/timer,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eP" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/engine,/area/engine/engineering)
|
||||
"eQ" = (/obj/machinery/dispenser{pltanks = 0},/turf/simulated/floor,/area/engine/engineering)
|
||||
@@ -253,11 +253,11 @@
|
||||
"eS" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/turf/simulated/floor,/area/engine/engineering)
|
||||
"eT" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eU" = (/obj/machinery/door/window/eastleft,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eV" = (/obj/structure/stool/chair{dir = 4},/obj/effect/landmark/start{name = "Captain"},/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eV" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Captain"},/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eW" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/device/assembly/signaler,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eX" = (/turf/simulated/wall,/area/derelict/storage/equipment)
|
||||
"eY" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eZ" = (/obj/structure/stool/chair{dir = 4},/obj/effect/landmark/start{name = "Head of Personnel"},/turf/simulated/floor,/area/derelict/bridge)
|
||||
"eZ" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Head of Personnel"},/turf/simulated/floor,/area/derelict/bridge)
|
||||
"fa" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/device/assembly/signaler,/obj/item/device/radio/beacon,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"fb" = (/obj/structure/table,/obj/item/device/healthanalyzer,/turf/simulated/floor,/area/engine/engineering)
|
||||
"fc" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/turf/simulated/floor,/area/engine/engineering)
|
||||
@@ -269,7 +269,7 @@
|
||||
"fi" = (/obj/structure/table,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/clothing/glasses/sunglasses,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor,/area/derelict/storage/equipment)
|
||||
"fj" = (/obj/structure/table,/obj/item/device/assembly/infra,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"fk" = (/obj/structure/table,/obj/item/device/assembly/signaler,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"fl" = (/obj/structure/stool/chair,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"fl" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"fm" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"fn" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/floor,/area/derelict/bridge)
|
||||
"fo" = (/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor,/area/derelict/storage/equipment)
|
||||
@@ -337,8 +337,8 @@
|
||||
"gy" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/medbay)
|
||||
"gz" = (/turf/simulated/floor,/area/medical/medbay)
|
||||
"gA" = (/obj/structure/table,/turf/simulated/floor,/area/derelict/arrival)
|
||||
"gB" = (/obj/structure/stool/chair,/turf/simulated/floor,/area/derelict/arrival)
|
||||
"gC" = (/obj/structure/stool/chair{dir = 8},/turf/simulated/floor,/area/derelict/arrival)
|
||||
"gB" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/derelict/arrival)
|
||||
"gC" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor,/area/derelict/arrival)
|
||||
"gD" = (/obj/structure/closet/coffin,/turf/simulated/floor,/area/chapel/main)
|
||||
"gE" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/medbay)
|
||||
"gF" = (/turf/simulated/wall,/area/medical/genetics)
|
||||
@@ -383,7 +383,7 @@
|
||||
"hs" = (/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"ht" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/genetics)
|
||||
"hu" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor,/area/medical/genetics)
|
||||
"hv" = (/obj/structure/stool/chair{dir = 1},/turf/simulated/floor,/area/medical/genetics)
|
||||
"hv" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/medical/genetics)
|
||||
"hw" = (/turf/simulated/wall/r_wall,/area/toxins/lab)
|
||||
"hx" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/turf/simulated/shuttle/wall{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area)
|
||||
"hy" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area)
|
||||
@@ -393,9 +393,9 @@
|
||||
"hC" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 5},/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"hD" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"hE" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"hF" = (/obj/structure/stool/chair,/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"hF" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"hG" = (/obj/structure/table,/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"hH" = (/obj/structure/stool/chair{dir = 8},/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"hH" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"hI" = (/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor,/area/medical/genetics)
|
||||
"hJ" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor,/area/toxins/lab)
|
||||
"hK" = (/turf/simulated/floor,/area/toxins/lab)
|
||||
@@ -422,8 +422,8 @@
|
||||
"if" = (/obj/structure/window/reinforced,/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor,/area/medical/genetics)
|
||||
"ig" = (/obj/structure/window/reinforced,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/item/clothing/mask/muzzle,/turf/simulated/floor,/area/medical/genetics)
|
||||
"ih" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor,/area/toxins/lab)
|
||||
"ii" = (/obj/structure/stool/chair{dir = 1},/turf/simulated/floor,/area/derelict/arrival)
|
||||
"ij" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/stool/chair{dir = 1},/turf/simulated/floor,/area/derelict/arrival)
|
||||
"ii" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/derelict/arrival)
|
||||
"ij" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/derelict/arrival)
|
||||
"ik" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/space,/area)
|
||||
"il" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area)
|
||||
"im" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area)
|
||||
@@ -435,8 +435,8 @@
|
||||
"is" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main)
|
||||
"it" = (/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main)
|
||||
"iu" = (/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main)
|
||||
"iv" = (/obj/structure/stool/chair{dir = 8},/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main)
|
||||
"iw" = (/obj/structure/stool/chair{dir = 8},/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main)
|
||||
"iv" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main)
|
||||
"iw" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main)
|
||||
"ix" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor,/area/medical/medbay)
|
||||
"iy" = (/obj/machinery/door/window/eastleft,/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"iz" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/medical/genetics)
|
||||
@@ -451,12 +451,12 @@
|
||||
"iI" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area)
|
||||
"iJ" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area)
|
||||
"iK" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s9"; icon_state = "swall_s9"; dir = 2},/area)
|
||||
"iL" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/stool/chair{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "chapel"},/area/chapel/main)
|
||||
"iL" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "chapel"},/area/chapel/main)
|
||||
"iM" = (/obj/structure/table,/turf/simulated/floor{icon_state = "chapel"},/area/chapel/main)
|
||||
"iN" = (/turf/simulated/floor{dir = 8; icon_state = "chapel"},/area/chapel/main)
|
||||
"iO" = (/turf/simulated/floor{icon_state = "chapel"},/area/chapel/main)
|
||||
"iP" = (/obj/structure/stool/chair{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "chapel"},/area/chapel/main)
|
||||
"iQ" = (/obj/structure/stool/chair{dir = 8},/turf/simulated/floor{icon_state = "chapel"},/area/chapel/main)
|
||||
"iP" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "chapel"},/area/chapel/main)
|
||||
"iQ" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "chapel"},/area/chapel/main)
|
||||
"iR" = (/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"iS" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"iT" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/machinery/door/window/eastleft{req_access_txt = "9"},/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/genetics)
|
||||
@@ -476,7 +476,7 @@
|
||||
"jh" = (/obj/structure/window/reinforced,/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main)
|
||||
"ji" = (/obj/structure/window/reinforced,/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main)
|
||||
"jj" = (/obj/machinery/door/window/southleft{req_access_txt = "22"},/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main)
|
||||
"jk" = (/obj/structure/stool/chair{dir = 8},/obj/effect/landmark/start{name = "Chaplain"},/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main)
|
||||
"jk" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/landmark/start{name = "Chaplain"},/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main)
|
||||
"jl" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "whiteshiny"},/area/medical/medbay)
|
||||
"jm" = (/mob/living/carbon/monkey,/turf/simulated/floor,/area/medical/genetics)
|
||||
"jn" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor,/area/medical/genetics)
|
||||
@@ -500,7 +500,7 @@
|
||||
"jF" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor,/area/toxins/lab)
|
||||
"jG" = (/obj/structure/table,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/device/assembly/timer,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/turf/simulated/floor,/area/toxins/lab)
|
||||
"jH" = (/obj/structure/table,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/device/assembly/timer,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor,/area/toxins/lab)
|
||||
"jI" = (/obj/structure/stool/chair{dir = 8},/obj/effect/landmark{name = "JoinLate"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area)
|
||||
"jI" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/landmark{name = "JoinLate"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area)
|
||||
"jJ" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/turf/simulated/shuttle/wall{tag = "icon-swall_f5"; icon_state = "swall_f5"; dir = 2},/area)
|
||||
"jK" = (/obj/structure/window/reinforced{dir = 1},/turf/space,/area)
|
||||
"jL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/chapel/main)
|
||||
@@ -693,8 +693,8 @@
|
||||
"nq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/derelict/hallway/secondary)
|
||||
"nr" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire,/turf/simulated/floor,/area/derelict/storage/storage_access)
|
||||
"ns" = (/obj/structure/table,/obj/item/weapon/paper_bin,/obj/item/weapon/clipboard,/turf/simulated/floor,/area/derelict/storage/storage_access)
|
||||
"nt" = (/obj/structure/stool/chair{dir = 1},/obj/machinery/door_control{id = "vent1"; pixel_x = -24},/turf/simulated/floor,/area/atmos)
|
||||
"nu" = (/obj/structure/stool/chair{dir = 1},/turf/simulated/floor,/area/atmos)
|
||||
"nt" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/door_control{id = "vent1"; pixel_x = -24},/turf/simulated/floor,/area/atmos)
|
||||
"nu" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/atmos)
|
||||
"nv" = (/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor,/area/atmos)
|
||||
"nw" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor,/area/atmos)
|
||||
"nx" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor,/area/atmos)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+194
-194
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user