mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 21:48:21 +01:00
Merge remote-tracking branch 'ParadiseSS13/master' into removes-headcrabs
This commit is contained in:
AffectedArc07
+10354
-7812
File diff suppressed because it is too large
Load Diff
@@ -2219,7 +2219,7 @@
|
||||
pixel_x = 27;
|
||||
pixel_y = 29
|
||||
},
|
||||
/obj/machinery/suit_storage_unit/security/secure,
|
||||
/obj/machinery/suit_storage_unit/security/hos,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "dark"
|
||||
},
|
||||
@@ -24428,7 +24428,7 @@
|
||||
pixel_x = 4;
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/toy/figure/cargotech,
|
||||
/obj/item/toy/figure/crew/cargotech,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 5;
|
||||
icon_state = "cafeteria"
|
||||
@@ -30265,7 +30265,7 @@
|
||||
})
|
||||
"bnL" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/toy/figure/clown,
|
||||
/obj/item/toy/figure/crew/clown,
|
||||
/obj/item/reagent_containers/food/snacks/baguette,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "dark"
|
||||
@@ -35946,7 +35946,7 @@
|
||||
/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium,
|
||||
/obj/item/lighter/zippo/nt_rep,
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_robustgold,
|
||||
/obj/item/toy/figure/captain,
|
||||
/obj/item/toy/figure/crew/captain,
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/crew_quarters/captain{
|
||||
name = "\improper Captain's Quarters"
|
||||
@@ -46649,7 +46649,7 @@
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/atmos)
|
||||
"bUp" = (
|
||||
/obj/item/toy/figure/mime,
|
||||
/obj/item/toy/figure/crew/mime,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "dark"
|
||||
},
|
||||
@@ -48134,7 +48134,7 @@
|
||||
/area/crew_quarters/theatre)
|
||||
"bXq" = (
|
||||
/obj/machinery/light/small,
|
||||
/obj/item/toy/prize/honk{
|
||||
/obj/item/toy/figure/mech/honk{
|
||||
pixel_y = 12
|
||||
},
|
||||
/obj/structure/table/wood,
|
||||
@@ -53561,14 +53561,11 @@
|
||||
},
|
||||
/area/atmos)
|
||||
"ciX" = (
|
||||
/obj/structure/closet/crate/freezer,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/machinery/light{
|
||||
dir = 1;
|
||||
on = 1
|
||||
},
|
||||
/obj/structure/closet/crate/freezer/iv_storage,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 9;
|
||||
icon_state = "whiteblue"
|
||||
@@ -58845,14 +58842,10 @@
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/toxins/explab)
|
||||
"ctT" = (
|
||||
/obj/structure/closet/crate/freezer,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/radio/intercom{
|
||||
pixel_x = -28
|
||||
},
|
||||
/obj/structure/closet/crate/freezer/iv_storage,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "white"
|
||||
},
|
||||
@@ -60113,12 +60106,6 @@
|
||||
/area/maintenance/incinerator)
|
||||
"cwC" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/reagent_containers/iv_bag/blood/AMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/APlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OMinus,
|
||||
/obj/machinery/alarm{
|
||||
dir = 1;
|
||||
pixel_y = -24
|
||||
@@ -64689,15 +64676,9 @@
|
||||
/area/medical/genetics_cloning)
|
||||
"cGi" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/reagent_containers/iv_bag/blood/AMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/APlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OPlus,
|
||||
/obj/machinery/alarm{
|
||||
pixel_y = 23
|
||||
},
|
||||
/obj/item/reagent_containers/iv_bag/blood/OMinus,
|
||||
/obj/machinery/light{
|
||||
dir = 1;
|
||||
in_use = 1
|
||||
@@ -66927,14 +66908,10 @@
|
||||
name = "\improper Toxins Lab"
|
||||
})
|
||||
"cKz" = (
|
||||
/obj/structure/closet/crate/freezer,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/radio/intercom{
|
||||
pixel_x = -28
|
||||
},
|
||||
/obj/structure/closet/crate/freezer/iv_storage,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "white"
|
||||
},
|
||||
@@ -82963,14 +82940,11 @@
|
||||
name = "\improper Auxiliary Restrooms"
|
||||
})
|
||||
"umT" = (
|
||||
/obj/structure/closet/crate/freezer,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/item/reagent_containers/iv_bag,
|
||||
/obj/machinery/light{
|
||||
dir = 1;
|
||||
on = 1
|
||||
},
|
||||
/obj/structure/closet/crate/freezer/iv_storage,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 5;
|
||||
icon_state = "whiteblue"
|
||||
|
||||
@@ -181,7 +181,7 @@
|
||||
/obj/item/tank/internals/emergency_oxygen,
|
||||
/obj/item/trash/candy,
|
||||
/obj/effect/turf_decal/sand,
|
||||
/obj/item/toy/figure/bartender,
|
||||
/obj/item/toy/figure/crew/bartender,
|
||||
/turf/simulated/floor/beach/sand,
|
||||
/area/ruin/powered/beach)
|
||||
"aK" = (
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
})
|
||||
"at" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/toy/figure/bartender,
|
||||
/obj/item/toy/figure/crew/bartender,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ruin/powered{
|
||||
name = "Space Bar"
|
||||
|
||||
@@ -606,13 +606,11 @@
|
||||
},
|
||||
/area/security/range)
|
||||
"adH" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/pen/multi,
|
||||
/obj/machinery/light{
|
||||
dir = 1;
|
||||
on = 1
|
||||
},
|
||||
/obj/item/paper_bin/nanotrasen,
|
||||
/obj/machinery/suit_storage_unit/security/hos,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "dark"
|
||||
},
|
||||
@@ -1596,6 +1594,8 @@
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/paper_bin/nanotrasen,
|
||||
/obj/item/pen/multi,
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/security/hos)
|
||||
"afN" = (
|
||||
@@ -9425,7 +9425,7 @@
|
||||
},
|
||||
/area/maintenance/fsmaint)
|
||||
"avc" = (
|
||||
/obj/item/toy/figure/secofficer,
|
||||
/obj/item/toy/figure/crew/secofficer,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "floorgrime"
|
||||
},
|
||||
@@ -10260,7 +10260,7 @@
|
||||
/area/maintenance/fsmaint)
|
||||
"awE" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/toy/griffin,
|
||||
/obj/item/toy/figure/griffin,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/fsmaint)
|
||||
"awF" = (
|
||||
@@ -11016,12 +11016,12 @@
|
||||
/area/maintenance/fsmaint)
|
||||
"ayf" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/toy/figure/hos,
|
||||
/obj/item/toy/figure/crew/hos,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/fsmaint)
|
||||
"ayg" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/toy/owl,
|
||||
/obj/item/toy/figure/owl,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/fsmaint)
|
||||
"ayh" = (
|
||||
@@ -14672,7 +14672,7 @@
|
||||
/area/maintenance/auxsolarport)
|
||||
"aFU" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/toy/figure/detective,
|
||||
/obj/item/toy/figure/crew/detective,
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
},
|
||||
@@ -23656,9 +23656,6 @@
|
||||
/area/hallway/secondary/construction{
|
||||
name = "\improper Garden"
|
||||
})
|
||||
"baf" = (
|
||||
/turf/simulated/floor/plating,
|
||||
/area/gateway)
|
||||
"bag" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
@@ -25292,16 +25289,18 @@
|
||||
},
|
||||
/area/hallway/primary/central/north)
|
||||
"bdw" = (
|
||||
/obj/structure/cable{
|
||||
d2 = 2;
|
||||
icon_state = "0-2";
|
||||
pixel_y = 1
|
||||
},
|
||||
/obj/item/flag/nt,
|
||||
/obj/machinery/power/apc{
|
||||
/obj/structure/sign/directions/medical{
|
||||
dir = 4;
|
||||
pixel_y = 25
|
||||
},
|
||||
/obj/structure/sign/directions/science{
|
||||
dir = 4;
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/structure/sign/directions/security{
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_y = 24
|
||||
pixel_y = 39
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
@@ -26845,14 +26844,18 @@
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/sign/directions/evac{
|
||||
/obj/structure/sign/directions/cargo{
|
||||
dir = 4;
|
||||
pixel_y = 24
|
||||
pixel_y = 25
|
||||
},
|
||||
/obj/structure/sign/directions/medical{
|
||||
/obj/structure/sign/directions/bridge{
|
||||
dir = 4;
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/structure/sign/directions/security{
|
||||
dir = 4;
|
||||
pixel_y = 39
|
||||
},
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/hallway/secondary/entry)
|
||||
"bgq" = (
|
||||
@@ -27145,12 +27148,6 @@
|
||||
},
|
||||
/area/hallway/primary/central/nw)
|
||||
"bgW" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
tag = ""
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "L11"
|
||||
},
|
||||
@@ -28072,6 +28069,11 @@
|
||||
},
|
||||
/area/ai_monitored/storage/eva)
|
||||
"biO" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
desc = "";
|
||||
icon_state = "L13"
|
||||
@@ -28786,6 +28788,17 @@
|
||||
icon_state = "4-8";
|
||||
tag = ""
|
||||
},
|
||||
/obj/structure/sign/directions/cargo{
|
||||
pixel_y = -39
|
||||
},
|
||||
/obj/structure/sign/directions/bridge{
|
||||
dir = 4;
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/structure/sign/directions/security{
|
||||
dir = 4;
|
||||
pixel_y = -25
|
||||
},
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/hallway/primary/central/nw)
|
||||
"bkr" = (
|
||||
@@ -28916,23 +28929,20 @@
|
||||
},
|
||||
/area/hallway/primary/central/north)
|
||||
"bkC" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8";
|
||||
tag = ""
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/sign/directions/engineering{
|
||||
pixel_y = -39
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8";
|
||||
tag = ""
|
||||
/obj/structure/sign/directions/science{
|
||||
dir = 4;
|
||||
pixel_y = -32
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 8;
|
||||
icon_state = "bluecorner"
|
||||
/obj/structure/sign/directions/medical{
|
||||
dir = 4;
|
||||
pixel_y = -25
|
||||
},
|
||||
/area/hallway/primary/central/north)
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/hallway/primary/central/east)
|
||||
"bkD" = (
|
||||
/obj/item/stack/rods{
|
||||
amount = 10
|
||||
@@ -30149,12 +30159,6 @@
|
||||
},
|
||||
/area/hallway/primary/central/north)
|
||||
"bni" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
tag = ""
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
@@ -30187,6 +30191,11 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
desc = "";
|
||||
icon_state = "L14"
|
||||
@@ -31216,6 +31225,11 @@
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 8;
|
||||
icon_state = "bluecorner"
|
||||
@@ -35531,18 +35545,12 @@
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/hallway/primary/central/ne)
|
||||
"bzc" = (
|
||||
/obj/structure/sign/directions/evac{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/directions/medical{
|
||||
/obj/machinery/status_display{
|
||||
dir = 4;
|
||||
pixel_y = 7
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/structure/sign/directions/science{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/wall,
|
||||
/area/crew_quarters/bar)
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/hallway/primary/starboard/east)
|
||||
"bzd" = (
|
||||
/turf/simulated/floor/plasteel{
|
||||
desc = "\"This is a plaque in honour of those who died in the great space lube airlock incident.\" Scratched in beneath that is a crude image of a clown and a spaceman. The spaceman is slipping. The clown is laughing.";
|
||||
@@ -35694,7 +35702,7 @@
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Escape Shuttle Cell";
|
||||
req_access_txt = "2"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
@@ -35760,7 +35768,7 @@
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Escape Shuttle Cell";
|
||||
req_access_txt = "2"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
@@ -36008,6 +36016,18 @@
|
||||
/area/hallway/primary/central/east)
|
||||
"bAg" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/sign/directions/evac{
|
||||
dir = 4;
|
||||
pixel_y = 25
|
||||
},
|
||||
/obj/structure/sign/directions/bridge{
|
||||
dir = 1;
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/structure/sign/directions/security{
|
||||
dir = 1;
|
||||
pixel_y = 39
|
||||
},
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/hallway/primary/central/east)
|
||||
"bAh" = (
|
||||
@@ -38009,10 +38029,6 @@
|
||||
/turf/simulated/wall,
|
||||
/area/quartermaster/storage)
|
||||
"bFn" = (
|
||||
/obj/machinery/status_display{
|
||||
layer = 4;
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
@@ -38022,6 +38038,17 @@
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/directions/science{
|
||||
pixel_y = 25
|
||||
},
|
||||
/obj/structure/sign/directions/medical{
|
||||
dir = 8;
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/structure/sign/directions/evac{
|
||||
dir = 4;
|
||||
pixel_y = 39
|
||||
},
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/hallway/primary/starboard/east)
|
||||
"bFo" = (
|
||||
@@ -38605,11 +38632,22 @@
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/hallway/secondary/exit)
|
||||
"bGt" = (
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 4;
|
||||
icon_state = "whiteblue"
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/area/medical/reception)
|
||||
/obj/structure/sign/directions/engineering{
|
||||
pixel_y = -39
|
||||
},
|
||||
/obj/structure/sign/directions/cargo{
|
||||
dir = 8;
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/structure/sign/directions/medical{
|
||||
dir = 4;
|
||||
pixel_y = -25
|
||||
},
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/hallway/primary/central/south)
|
||||
"bGu" = (
|
||||
/obj/machinery/computer/rdconsole/robotics,
|
||||
/obj/machinery/alarm{
|
||||
@@ -45458,7 +45496,7 @@
|
||||
/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium,
|
||||
/obj/item/lighter/zippo/nt_rep,
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_robustgold,
|
||||
/obj/item/toy/figure/captain,
|
||||
/obj/item/toy/figure/crew/captain,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/crew_quarters/captain/bedroom)
|
||||
@@ -46181,23 +46219,11 @@
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/hallway/primary/central/se)
|
||||
"bUM" = (
|
||||
/obj/structure/closet/crate/freezer,
|
||||
/obj/item/tank/internals/emergency_oxygen/engi/empty,
|
||||
/obj/item/tank/internals/emergency_oxygen/engi/empty,
|
||||
/obj/item/reagent_containers/iv_bag/blood/AMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/APlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/random,
|
||||
/obj/item/reagent_containers/iv_bag/blood/random,
|
||||
/obj/item/reagent_containers/iv_bag/blood/random,
|
||||
/obj/machinery/iv_drip,
|
||||
/obj/machinery/ai_status_display{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/structure/closet/crate/freezer/iv_storage,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
@@ -50259,20 +50285,8 @@
|
||||
},
|
||||
/area/medical/genetics_cloning)
|
||||
"cca" = (
|
||||
/obj/structure/closet/crate/freezer,
|
||||
/obj/item/tank/internals/emergency_oxygen/engi/empty,
|
||||
/obj/item/tank/internals/emergency_oxygen/engi/empty,
|
||||
/obj/item/reagent_containers/iv_bag/blood/AMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/APlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/random,
|
||||
/obj/item/reagent_containers/iv_bag/blood/random,
|
||||
/obj/item/reagent_containers/iv_bag/blood/random,
|
||||
/obj/machinery/iv_drip,
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/structure/closet/crate/freezer/iv_storage,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
@@ -52181,15 +52195,8 @@
|
||||
},
|
||||
/area/medical/ward)
|
||||
"cfJ" = (
|
||||
/obj/structure/closet/crate/freezer,
|
||||
/obj/item/reagent_containers/iv_bag/blood/AMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/APlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OMinus,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/structure/closet/crate/freezer/iv_storage,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "showroomfloor"
|
||||
},
|
||||
@@ -52914,18 +52921,6 @@
|
||||
/obj/structure/grille/broken,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/asmaint)
|
||||
"che" = (
|
||||
/obj/structure/sign/directions/engineering,
|
||||
/obj/structure/sign/directions/science{
|
||||
dir = 4;
|
||||
pixel_y = -7
|
||||
},
|
||||
/obj/structure/sign/directions/medical{
|
||||
dir = 4;
|
||||
pixel_y = 7
|
||||
},
|
||||
/turf/simulated/wall,
|
||||
/area/janitor)
|
||||
"chf" = (
|
||||
/turf/simulated/wall,
|
||||
/area/maintenance/asmaint)
|
||||
@@ -53079,14 +53074,7 @@
|
||||
},
|
||||
/area/medical/surgery2)
|
||||
"chu" = (
|
||||
/obj/structure/closet/crate/freezer,
|
||||
/obj/item/reagent_containers/iv_bag/blood/AMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/APlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OMinus,
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/structure/closet/crate/freezer/iv_storage,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "showroomfloor"
|
||||
},
|
||||
@@ -77107,13 +77095,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/storage)
|
||||
"dco" = (
|
||||
/obj/structure/sign/directions/security{
|
||||
dir = 1;
|
||||
pixel_y = 7
|
||||
},
|
||||
/turf/simulated/wall,
|
||||
/area/crew_quarters/mrchangs)
|
||||
"dcp" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
@@ -79861,6 +79842,15 @@
|
||||
/area/space/nearstation)
|
||||
"dje" = (
|
||||
/obj/item/twohanded/required/kirbyplants,
|
||||
/obj/machinery/power/apc{
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 2;
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 5;
|
||||
icon_state = "blue"
|
||||
@@ -85109,6 +85099,13 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/tcommsat/chamber)
|
||||
"oQa" = (
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 0;
|
||||
icon_state = "blue"
|
||||
},
|
||||
/area/hallway/primary/starboard/west)
|
||||
"oQe" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/airlock/hatch{
|
||||
@@ -111301,7 +111298,7 @@ aRM
|
||||
aEl
|
||||
aVD
|
||||
aPi
|
||||
baf
|
||||
aPi
|
||||
aSA
|
||||
aSA
|
||||
aSA
|
||||
@@ -111821,7 +111818,7 @@ aRw
|
||||
aRw
|
||||
aRw
|
||||
bml
|
||||
aSA
|
||||
aRw
|
||||
aRw
|
||||
aRw
|
||||
djZ
|
||||
@@ -115420,11 +115417,11 @@ aDN
|
||||
aDN
|
||||
aDN
|
||||
aDN
|
||||
dco
|
||||
aDN
|
||||
bdw
|
||||
bgW
|
||||
bni
|
||||
bkC
|
||||
bkz
|
||||
kwt
|
||||
aYf
|
||||
aYg
|
||||
@@ -115453,8 +115450,8 @@ bFC
|
||||
bFC
|
||||
cex
|
||||
cgj
|
||||
cfv
|
||||
che
|
||||
bGt
|
||||
chc
|
||||
chc
|
||||
chc
|
||||
chc
|
||||
@@ -119545,10 +119542,10 @@ bsN
|
||||
aUS
|
||||
bsN
|
||||
aUS
|
||||
bzc
|
||||
aUS
|
||||
bAg
|
||||
bHr
|
||||
bAg
|
||||
bkC
|
||||
bEp
|
||||
bEp
|
||||
bEp
|
||||
@@ -120319,7 +120316,7 @@ aVG
|
||||
aUS
|
||||
cMK
|
||||
bHy
|
||||
bAk
|
||||
bDa
|
||||
bEp
|
||||
aTV
|
||||
bDf
|
||||
@@ -122636,7 +122633,7 @@ bDb
|
||||
bEp
|
||||
aVx
|
||||
bDg
|
||||
bGt
|
||||
bNz
|
||||
bJP
|
||||
bEo
|
||||
bEo
|
||||
@@ -122889,7 +122886,7 @@ bdT
|
||||
bdT
|
||||
bAk
|
||||
bHy
|
||||
bDb
|
||||
oQa
|
||||
bNe
|
||||
aVI
|
||||
bDj
|
||||
@@ -129571,7 +129568,7 @@ bau
|
||||
bau
|
||||
bFn
|
||||
bHI
|
||||
bwv
|
||||
bzc
|
||||
bEA
|
||||
bEA
|
||||
bIa
|
||||
|
||||
@@ -4713,7 +4713,7 @@
|
||||
/obj/effect/decal/cleanable/cobweb2,
|
||||
/obj/structure/table,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/toy/figure/assistant,
|
||||
/obj/item/toy/figure/crew/assistant,
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
/turf/simulated/wall/indestructible/riveted,
|
||||
/area/space)
|
||||
"ag" = (
|
||||
/obj/item/toy/figure/syndie,
|
||||
/obj/item/toy/figure/crew/syndie,
|
||||
/turf/simulated/floor/plating/asteroid/snow/airless,
|
||||
/area/syndicate_mothership)
|
||||
"ai" = (
|
||||
@@ -9310,7 +9310,7 @@
|
||||
"HP" = (
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Escape Shuttle Cell";
|
||||
req_access_txt = "2"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/mineral/plastitanium/red/brig,
|
||||
/area/shuttle/escape)
|
||||
@@ -10333,7 +10333,7 @@
|
||||
"Of" = (
|
||||
/obj/machinery/door/airlock/titanium/glass{
|
||||
name = "Emergency Airlock Access";
|
||||
req_one_access_txt = "2;19"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/shuttle/escape)
|
||||
@@ -11621,7 +11621,7 @@
|
||||
"Wh" = (
|
||||
/obj/machinery/door/airlock/command/glass{
|
||||
name = "Escape Shuttle Cockpit";
|
||||
req_one_access_txt = "2;19"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 8;
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
"aG" = (
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Escape Shuttle Cell";
|
||||
req_access_txt = "2"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/mineral/plastitanium/red/brig,
|
||||
/area/shuttle/escape)
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
"aI" = (
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Escape Shuttle Cell";
|
||||
req_access_txt = "2"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/noslip,
|
||||
/area/shuttle/escape)
|
||||
|
||||
@@ -337,7 +337,7 @@
|
||||
"be" = (
|
||||
/obj/machinery/door/airlock/titanium/glass{
|
||||
name = "Emergency Airlock Access";
|
||||
req_one_access_txt = "2;19"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/shuttle/escape)
|
||||
@@ -367,7 +367,7 @@
|
||||
"bj" = (
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Escape Shuttle Cell";
|
||||
req_access_txt = "2"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/mineral/plastitanium/red/brig,
|
||||
/area/shuttle/escape)
|
||||
@@ -473,7 +473,7 @@
|
||||
"bC" = (
|
||||
/obj/machinery/door/airlock/command/glass{
|
||||
name = "Escape Shuttle Cockpit";
|
||||
req_one_access_txt = "2;19"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 8;
|
||||
|
||||
@@ -761,6 +761,16 @@
|
||||
icon_state = "cmo"
|
||||
},
|
||||
/area/shuttle/escape)
|
||||
"tG" = (
|
||||
/obj/machinery/door/airlock/command/glass{
|
||||
name = "Escape Shuttle Cockpit";
|
||||
normalspeed = 0;
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "dark"
|
||||
},
|
||||
/area/shuttle/escape)
|
||||
"xD" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/reagent_containers/iv_bag/blood/random,
|
||||
@@ -1065,7 +1075,7 @@ an
|
||||
an
|
||||
an
|
||||
an
|
||||
aE
|
||||
tG
|
||||
ba
|
||||
ba
|
||||
ba
|
||||
@@ -1096,7 +1106,7 @@ an
|
||||
an
|
||||
an
|
||||
an
|
||||
aE
|
||||
tG
|
||||
ba
|
||||
ba
|
||||
ba
|
||||
|
||||
@@ -386,7 +386,7 @@
|
||||
"bj" = (
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Brig";
|
||||
req_access_txt = "2"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/mineral/plastitanium/red/brig,
|
||||
/area/shuttle/escape)
|
||||
|
||||
@@ -260,7 +260,7 @@
|
||||
"bc" = (
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Escape Shuttle Cell";
|
||||
req_access_txt = "2"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/escape)
|
||||
|
||||
@@ -285,7 +285,7 @@
|
||||
"db" = (
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Escape Shuttle Cell";
|
||||
req_access_txt = "2"
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/escape)
|
||||
|
||||
@@ -376,7 +376,7 @@
|
||||
for(var/obj/screen/craft/crafting in static_inventory)
|
||||
if(!S.can_craft)
|
||||
crafting.invisibility = INVISIBILITY_ABSTRACT
|
||||
H.handcrafting.close(H)
|
||||
H.handcrafting?.close(H)
|
||||
else
|
||||
crafting.invisibility = initial(crafting.invisibility)
|
||||
|
||||
|
||||
@@ -484,7 +484,7 @@
|
||||
head = /obj/item/clothing/head/xenos
|
||||
glasses = /obj/item/clothing/glasses/thermal
|
||||
l_pocket = /obj/item/tank/internals/emergency_oxygen/double
|
||||
r_pocket = /obj/item/toy/toy_xeno
|
||||
r_pocket = /obj/item/toy/figure/xeno
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/survival = 1,
|
||||
/obj/item/clothing/head/welding = 1,
|
||||
|
||||
@@ -905,7 +905,8 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
|
||||
/obj/item/reagent_containers/iv_bag/blood/BPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/BMinus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OPlus,
|
||||
/obj/item/reagent_containers/iv_bag/blood/OMinus)
|
||||
/obj/item/reagent_containers/iv_bag/blood/OMinus,
|
||||
/obj/item/reagent_containers/iv_bag/slime)
|
||||
cost = 35
|
||||
containertype = /obj/structure/closet/crate/freezer
|
||||
containername = "blood pack crate"
|
||||
|
||||
@@ -1543,6 +1543,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
/area/security/vacantoffice2
|
||||
name = "\improper Vacant Office"
|
||||
icon_state = "security"
|
||||
|
||||
/area/security/permasolitary
|
||||
name = "Solitary Confinement"
|
||||
icon_state = "solitary"
|
||||
|
||||
/area/quartermaster
|
||||
name = "\improper Quartermasters"
|
||||
|
||||
@@ -100,6 +100,15 @@
|
||||
|
||||
/obj/machinery/suit_storage_unit/security/pod_pilot
|
||||
req_access = list(ACCESS_PILOT)
|
||||
|
||||
/obj/machinery/suit_storage_unit/security/hos
|
||||
name = "Head of Security's suit storage unit"
|
||||
suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos
|
||||
mask_type = /obj/item/clothing/mask/gas/sechailer/hos
|
||||
req_access = list(ACCESS_HOS)
|
||||
|
||||
/obj/machinery/suit_storage_unit/security/hos/secure
|
||||
secure = TRUE
|
||||
|
||||
/obj/machinery/suit_storage_unit/atmos
|
||||
name = "atmospherics suit storage unit"
|
||||
|
||||
@@ -156,7 +156,8 @@
|
||||
*/
|
||||
/obj/machinery/computer/teleporter/proc/resetPowerstation()
|
||||
power_station.engaged = FALSE
|
||||
power_station.teleporter_hub.calibrated = FALSE
|
||||
if(power_station.teleporter_hub.accurate < 3)
|
||||
power_station.teleporter_hub.calibrated = FALSE
|
||||
power_station.teleporter_hub.update_icon()
|
||||
|
||||
/**
|
||||
|
||||
@@ -1175,7 +1175,7 @@
|
||||
/obj/item/reagent_containers/syringe/insulin = 6, /obj/item/reagent_containers/syringe/calomel = 10, /obj/item/reagent_containers/syringe/heparin = 4, /obj/item/reagent_containers/hypospray/autoinjector = 5, /obj/item/reagent_containers/food/pill/salbutamol = 10,
|
||||
/obj/item/reagent_containers/food/pill/mannitol = 10, /obj/item/reagent_containers/food/pill/mutadone = 5, /obj/item/stack/medical/bruise_pack/advanced = 4, /obj/item/stack/medical/ointment/advanced = 4, /obj/item/stack/medical/bruise_pack = 4,
|
||||
/obj/item/stack/medical/splint = 4, /obj/item/reagent_containers/glass/beaker = 4, /obj/item/reagent_containers/dropper = 4, /obj/item/healthanalyzer = 4,
|
||||
/obj/item/healthupgrade = 4, /obj/item/reagent_containers/hypospray/safety = 2, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/reagent_containers/iv_bag/slime = 1)
|
||||
/obj/item/healthupgrade = 4, /obj/item/reagent_containers/hypospray/safety = 2, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2)
|
||||
contraband = list(/obj/item/reagent_containers/glass/bottle/sulfonal = 1, /obj/item/reagent_containers/glass/bottle/pancuronium = 1)
|
||||
armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
|
||||
resistance_flags = FIRE_PROOF
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
/obj/item/toy/random
|
||||
name = "Random Toy"
|
||||
|
||||
/obj/item/toy/random/New()
|
||||
/obj/item/toy/random/Initialize(mapload)
|
||||
..()
|
||||
var/list/types = list(/obj/item/gun/projectile/shotgun/toy/crossbow, /obj/item/toy/balloon,/obj/item/toy/spinningtoy,/obj/item/reagent_containers/spray/waterflower) + subtypesof(/obj/item/toy/prize)
|
||||
var/list/types = list(/obj/item/gun/projectile/shotgun/toy/crossbow, /obj/item/toy/balloon,/obj/item/toy/spinningtoy,/obj/item/reagent_containers/spray/waterflower) + subtypesof(/obj/item/toy/figure/mech)
|
||||
var/T = pick(types)
|
||||
new T(loc)
|
||||
qdel(src)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
// -------------------------------------
|
||||
// Random cleanables, clearly this makes sense
|
||||
|
||||
+222
-240
@@ -310,96 +310,6 @@
|
||||
new /obj/item/toy/snappop/phoenix(get_turf(src))
|
||||
qdel(src)
|
||||
|
||||
|
||||
/*
|
||||
* Mech prizes
|
||||
*/
|
||||
/obj/item/toy/prize
|
||||
icon = 'icons/obj/toy.dmi'
|
||||
icon_state = "ripleytoy"
|
||||
var/cooldown = 0
|
||||
|
||||
//all credit to skasi for toy mech fun ideas
|
||||
/obj/item/toy/prize/attack_self(mob/user as mob)
|
||||
if(cooldown < world.time - 8)
|
||||
to_chat(user, "<span class='notice'>You play with [src].</span>")
|
||||
playsound(user, 'sound/mecha/mechstep.ogg', 20, 1)
|
||||
cooldown = world.time
|
||||
|
||||
/obj/item/toy/prize/attack_hand(mob/user as mob)
|
||||
if(loc == user)
|
||||
if(cooldown < world.time - 8)
|
||||
to_chat(user, "<span class='notice'>You play with [src].</span>")
|
||||
playsound(user, 'sound/mecha/mechturn.ogg', 20, 1)
|
||||
cooldown = world.time
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/random/mech
|
||||
name = "Random Mech Prize"
|
||||
desc = "This is a random prize"
|
||||
icon = 'icons/obj/toy.dmi'
|
||||
icon_state = "ripleytoy"
|
||||
|
||||
/obj/random/mech/item_to_spawn()
|
||||
return pick(subtypesof(/obj/item/toy/prize)) //exclude the base type.
|
||||
|
||||
/obj/item/toy/prize/ripley
|
||||
name = "toy ripley"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 1/11. This one is a ripley, a mining and engineering mecha."
|
||||
|
||||
/obj/item/toy/prize/fireripley
|
||||
name = "toy firefighting ripley"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 2/11. This one is a firefighter ripley, a fireproof mining and engineering mecha."
|
||||
icon_state = "fireripleytoy"
|
||||
|
||||
/obj/item/toy/prize/deathripley
|
||||
name = "toy deathsquad ripley"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 3/11. This one is the black ripley used by the hero of DeathSquad, that TV drama about loose-cannon ERT officers!"
|
||||
icon_state = "deathripleytoy"
|
||||
|
||||
/obj/item/toy/prize/gygax
|
||||
name = "toy gygax"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 4/11. This one is the speedy gygax combat mecha. Zoom zoom, pew pew!"
|
||||
icon_state = "gygaxtoy"
|
||||
|
||||
/obj/item/toy/prize/durand
|
||||
name = "toy durand"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 5/11. This one is the heavy durand combat mecha. Stomp stomp!"
|
||||
icon_state = "durandprize"
|
||||
|
||||
/obj/item/toy/prize/honk
|
||||
name = "toy H.O.N.K."
|
||||
desc = "Mini-Mecha action figure! Collect them all! 6/11. This one is the infamous H.O.N.K mech!"
|
||||
icon_state = "honkprize"
|
||||
|
||||
/obj/item/toy/prize/marauder
|
||||
name = "toy marauder"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 7/11. This one is the powerful marauder combat mecha! Run for cover!"
|
||||
icon_state = "marauderprize"
|
||||
|
||||
/obj/item/toy/prize/seraph
|
||||
name = "toy seraph"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 8/11. This one is the powerful seraph combat mecha! Someone's in trouble!"
|
||||
icon_state = "seraphprize"
|
||||
|
||||
/obj/item/toy/prize/mauler
|
||||
name = "toy mauler"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 9/11. This one is the deadly mauler combat mecha! Look out!"
|
||||
icon_state = "maulerprize"
|
||||
|
||||
/obj/item/toy/prize/odysseus
|
||||
name = "toy odysseus"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 10/11. This one is the spindly, syringe-firing odysseus medical mecha."
|
||||
icon_state = "odysseusprize"
|
||||
|
||||
/obj/item/toy/prize/phazon
|
||||
name = "toy phazon"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 11/11. This one is the mysterious Phazon combat mecha! Nobody's safe!"
|
||||
icon_state = "phazonprize"
|
||||
|
||||
|
||||
|
||||
/*
|
||||
|| A Deck of Cards for playing various games of chance ||
|
||||
*/
|
||||
@@ -1242,48 +1152,10 @@
|
||||
user.loc.visible_message("<span class='danger'>[bicon(src)] [message]</span>")
|
||||
sleep(10)
|
||||
|
||||
/obj/item/toy/owl
|
||||
name = "owl action figure"
|
||||
desc = "An action figure modeled after 'The Owl', defender of justice."
|
||||
icon = 'icons/obj/toy.dmi'
|
||||
icon_state = "owlprize"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
var/cooldown = 0
|
||||
|
||||
/obj/item/toy/owl/attack_self(mob/user)
|
||||
if(!cooldown) //for the sanity of everyone
|
||||
var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!")
|
||||
to_chat(user, "<span class='notice'>You pull the string on [src].</span>")
|
||||
playsound(user, 'sound/creatures/hoot.ogg', 25, 1)
|
||||
visible_message("<span class='danger'>[bicon(src)] [message]</span>")
|
||||
cooldown = 1
|
||||
spawn(30) cooldown = 0
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/item/toy/griffin
|
||||
name = "griffin action figure"
|
||||
desc = "An action figure modeled after 'The Griffin', criminal mastermind."
|
||||
icon = 'icons/obj/toy.dmi'
|
||||
icon_state = "griffinprize"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
var/cooldown = 0
|
||||
|
||||
/obj/item/toy/griffin/attack_self(mob/user)
|
||||
if(!cooldown) //for the sanity of everyone
|
||||
var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!")
|
||||
to_chat(user, "<span class='notice'>You pull the string on [src].</span>")
|
||||
playsound(user, 'sound/creatures/caw.ogg', 25, 1)
|
||||
visible_message("<span class='danger'>[bicon(src)] [message]</span>")
|
||||
cooldown = 1
|
||||
spawn(30) cooldown = 0
|
||||
return
|
||||
..()
|
||||
|
||||
// DND Character minis. Use the naming convention (type)character for the icon states.
|
||||
/obj/item/toy/character
|
||||
icon = 'icons/obj/toy.dmi'
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
pixel_z = 5
|
||||
|
||||
/obj/item/toy/character/alien
|
||||
@@ -1392,35 +1264,6 @@
|
||||
to_chat(user, "<span class='warning'>You stop feeding \the [O] into \the [src]'s mini-input.</span>")
|
||||
else ..()
|
||||
|
||||
/*
|
||||
* Xenomorph action figure
|
||||
*/
|
||||
|
||||
/obj/item/toy/toy_xeno
|
||||
icon = 'icons/obj/toy.dmi'
|
||||
icon_state = "toy_xeno"
|
||||
name = "xenomorph action figure"
|
||||
desc = "MEGA presents the new Xenos Isolated action figure! Comes complete with realistic sounds! Pull back string to use."
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
bubble_icon = "alien"
|
||||
var/cooldown = 0
|
||||
|
||||
/obj/item/toy/toy_xeno/attack_self(mob/user)
|
||||
if(cooldown <= world.time)
|
||||
cooldown = (world.time + 50) //5 second cooldown
|
||||
user.visible_message("<span class='notice'>[user] pulls back the string on [src].</span>")
|
||||
icon_state = "[initial(icon_state)]_used"
|
||||
sleep(5)
|
||||
atom_say("Hiss!")
|
||||
var/list/possible_sounds = list('sound/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg')
|
||||
playsound(get_turf(src), pick(possible_sounds), 50, 1)
|
||||
spawn(45)
|
||||
if(src)
|
||||
icon_state = "[initial(icon_state)]"
|
||||
else
|
||||
to_chat(user, "<span class='warning'>The string on [src] hasn't rewound all the way!</span>")
|
||||
return
|
||||
|
||||
/obj/item/toy/russian_revolver
|
||||
name = "russian revolver"
|
||||
desc = "for fun and games!"
|
||||
@@ -1562,7 +1405,7 @@
|
||||
icon_state = "nuketoy"
|
||||
|
||||
/obj/random/figure/item_to_spawn()
|
||||
return pick(subtypesof(/obj/item/toy/figure))
|
||||
return pick(subtypesof(/obj/item/toy/figure/crew))
|
||||
|
||||
|
||||
/obj/item/toy/figure
|
||||
@@ -1570,235 +1413,374 @@
|
||||
desc = "A \"Space Life\" brand... wait, what the hell is this thing?"
|
||||
icon = 'icons/obj/toy.dmi'
|
||||
icon_state = "nuketoy"
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
var/cooldown = 0
|
||||
var/cooldown_time = 3 SECONDS
|
||||
|
||||
/obj/item/toy/figure/attack_self(mob/user)
|
||||
..()
|
||||
if(cooldown < world.time)
|
||||
cooldown = world.time + cooldown_time
|
||||
activate(user)
|
||||
else
|
||||
on_cooldown(user)
|
||||
|
||||
/obj/item/toy/figure/proc/activate(mob/user)
|
||||
return
|
||||
|
||||
/obj/item/toy/figure/proc/on_cooldown(mob/user)
|
||||
return
|
||||
|
||||
/obj/item/toy/figure/crew
|
||||
var/toysay = "What the fuck did you do?"
|
||||
|
||||
/obj/item/toy/figure/New()
|
||||
..()
|
||||
desc = "A \"Space Life\" brand [name]"
|
||||
/obj/item/toy/figure/crew/activate(mob/user)
|
||||
atom_say(toysay)
|
||||
playsound(user, 'sound/machines/click.ogg', 20, TRUE)
|
||||
|
||||
/obj/item/toy/figure/attack_self(mob/user as mob)
|
||||
if(cooldown < world.time)
|
||||
cooldown = (world.time + 30) //3 second cooldown
|
||||
user.visible_message("<span class='notice'>[bicon(src)] [src] says \"[toysay]\".</span>")
|
||||
playsound(user, 'sound/machines/click.ogg', 20, 1)
|
||||
|
||||
/obj/item/toy/figure/cmo
|
||||
name = "Chief Medical Officer action figure"
|
||||
/obj/item/toy/figure/crew/cmo
|
||||
name = "\improper Chief Medical Officer action figure"
|
||||
desc = "The ever-suffering CMO, from Space Life's SS12 figurine collection."
|
||||
icon_state = "cmo"
|
||||
toysay = "Suit sensors!"
|
||||
|
||||
/obj/item/toy/figure/assistant
|
||||
name = "Assistant action figure"
|
||||
/obj/item/toy/figure/crew/assistant
|
||||
name = "\improper Assistant action figure"
|
||||
desc = "The faceless, hairless scourge of the station, from Space Life's SS12 figurine collection."
|
||||
icon_state = "assistant"
|
||||
toysay = "Grey tide station wide!"
|
||||
|
||||
/obj/item/toy/figure/atmos
|
||||
name = "Atmospheric Technician action figure"
|
||||
/obj/item/toy/figure/crew/atmos
|
||||
name = "\improper Atmospheric Technician action figure"
|
||||
desc = "The faithful atmospheric technician, from Space Life's SS12 figurine collection."
|
||||
icon_state = "atmos"
|
||||
toysay = "Glory to Atmosia!"
|
||||
|
||||
/obj/item/toy/figure/bartender
|
||||
name = "Bartender action figure"
|
||||
/obj/item/toy/figure/crew/bartender
|
||||
name = "\improper Bartender action figure"
|
||||
desc = "The suave bartender, from Space Life's SS12 figurine collection."
|
||||
icon_state = "bartender"
|
||||
toysay = "Wheres my monkey?"
|
||||
|
||||
/obj/item/toy/figure/borg
|
||||
name = "Cyborg action figure"
|
||||
/obj/item/toy/figure/crew/borg
|
||||
name = "\improper Cyborg action figure"
|
||||
desc = "The iron-willed cyborg, from Space Life's SS12 figurine collection."
|
||||
icon_state = "borg"
|
||||
toysay = "I. LIVE. AGAIN."
|
||||
|
||||
/obj/item/toy/figure/botanist
|
||||
name = "Botanist action figure"
|
||||
/obj/item/toy/figure/crew/botanist
|
||||
name = "\improper Botanist action figure"
|
||||
desc = "The drug-addicted botanist, from Space Life's SS12 figurine collection."
|
||||
icon_state = "botanist"
|
||||
toysay = "Dude, I see colors..."
|
||||
|
||||
/obj/item/toy/figure/captain
|
||||
name = "Captain action figure"
|
||||
/obj/item/toy/figure/crew/captain
|
||||
name = "\improper Captain action figure"
|
||||
desc = "The inept captain, from Space Life's SS12 figurine collection."
|
||||
icon_state = "captain"
|
||||
toysay = "Crew, the Nuke Disk is safely up my ass."
|
||||
|
||||
/obj/item/toy/figure/cargotech
|
||||
name = "Cargo Technician action figure"
|
||||
/obj/item/toy/figure/crew/cargotech
|
||||
name = "\improper Cargo Technician action figure"
|
||||
desc = "The hard-working cargo tech, from Space Life's SS12 figurine collection."
|
||||
icon_state = "cargotech"
|
||||
toysay = "For Cargonia!"
|
||||
|
||||
/obj/item/toy/figure/ce
|
||||
name = "Chief Engineer action figure"
|
||||
/obj/item/toy/figure/crew/ce
|
||||
name = "\improper Chief Engineer action figure"
|
||||
desc = "The expert Chief Engineer, from Space Life's SS12 figurine collection."
|
||||
icon_state = "ce"
|
||||
toysay = "Wire the solars!"
|
||||
|
||||
/obj/item/toy/figure/chaplain
|
||||
name = "Chaplain action figure"
|
||||
/obj/item/toy/figure/crew/chaplain
|
||||
name = "\improper Chaplain action figure"
|
||||
desc = "The obsessed Chaplain, from Space Life's SS12 figurine collection."
|
||||
icon_state = "chaplain"
|
||||
toysay = "Gods make me a killing machine please!"
|
||||
|
||||
/obj/item/toy/figure/chef
|
||||
name = "Chef action figure"
|
||||
/obj/item/toy/figure/crew/chef
|
||||
name = "\improper Chef action figure"
|
||||
desc = "The cannibalistic chef, from Space Life's SS12 figurine collection."
|
||||
icon_state = "chef"
|
||||
toysay = "I swear it's not human meat."
|
||||
|
||||
/obj/item/toy/figure/chemist
|
||||
name = "Chemist action figure"
|
||||
/obj/item/toy/figure/crew/chemist
|
||||
name = "\improper Chemist action figure"
|
||||
desc = "The legally dubious Chemist, from Space Life's SS12 figurine collection."
|
||||
icon_state = "chemist"
|
||||
toysay = "Get your pills!"
|
||||
|
||||
/obj/item/toy/figure/clown
|
||||
name = "Clown action figure"
|
||||
/obj/item/toy/figure/crew/clown
|
||||
name = "\improper Clown action figure"
|
||||
desc = "The mischevious Clown, from Space Life's SS12 figurine collection."
|
||||
icon_state = "clown"
|
||||
toysay = "Honk!"
|
||||
|
||||
/obj/item/toy/figure/ian
|
||||
name = "Ian action figure"
|
||||
/obj/item/toy/figure/crew/ian
|
||||
name = "\improper Ian action figure"
|
||||
desc = "The adorable corgi, from Space Life's SS12 figurine collection."
|
||||
icon_state = "ian"
|
||||
toysay = "Arf!"
|
||||
|
||||
/obj/item/toy/figure/detective
|
||||
name = "Detective action figure"
|
||||
/obj/item/toy/figure/crew/detective
|
||||
name = "\improper Detective action figure"
|
||||
desc = "The clever detective, from Space Life's SS12 figurine collection."
|
||||
icon_state = "detective"
|
||||
toysay = "This airlock has grey jumpsuit and insulated glove fibers on it."
|
||||
|
||||
/obj/item/toy/figure/dsquad
|
||||
name = "Death Squad Officer action figure"
|
||||
/obj/item/toy/figure/crew/dsquad
|
||||
name = "\improper Death Squad Officer action figure"
|
||||
desc = "It's a member of the DeathSquad, a TV drama where loose-cannon ERT officers face up against the threats of the galaxy! It's from Space Life's special edition SS12 figurine collection."
|
||||
icon_state = "dsquad"
|
||||
toysay = "Eliminate all threats!"
|
||||
|
||||
/obj/item/toy/figure/engineer
|
||||
name = "Engineer action figure"
|
||||
/obj/item/toy/figure/crew/engineer
|
||||
name = "\improper Engineer action figure"
|
||||
desc = "The frantic engineer, from Space Life's SS12 figurine collection."
|
||||
icon_state = "engineer"
|
||||
toysay = "Oh god, the singularity is loose!"
|
||||
|
||||
/obj/item/toy/figure/geneticist
|
||||
name = "Geneticist action figure"
|
||||
/obj/item/toy/figure/crew/geneticist
|
||||
name = "\improper Geneticist action figure"
|
||||
desc = "The balding geneticist, from Space Life's SS12 figurine collection."
|
||||
icon_state = "geneticist"
|
||||
toysay = "I'm not qualified for this job."
|
||||
|
||||
/obj/item/toy/figure/hop
|
||||
name = "Head of Personnel action figure"
|
||||
/obj/item/toy/figure/crew/hop
|
||||
name = "\improper Head of Personnel action figure"
|
||||
desc = "The officious Head of Personnel, from Space Life's SS12 figurine collection."
|
||||
icon_state = "hop"
|
||||
toysay = "Papers, please!"
|
||||
|
||||
/obj/item/toy/figure/hos
|
||||
name = "Head of Security action figure"
|
||||
/obj/item/toy/figure/crew/hos
|
||||
name = "\improper Head of Security action figure"
|
||||
desc = "The bloodlust-filled Head of Security, from Space Life's SS12 figurine collection."
|
||||
icon_state = "hos"
|
||||
toysay = "Space law? What?"
|
||||
|
||||
/obj/item/toy/figure/qm
|
||||
name = "Quartermaster action figure"
|
||||
/obj/item/toy/figure/crew/qm
|
||||
name = "\improper Quartermaster action figure"
|
||||
desc = "The nationalistic Quartermaster, from Space Life's SS12 figurine collection."
|
||||
icon_state = "qm"
|
||||
toysay = "Hail Cargonia!"
|
||||
|
||||
/obj/item/toy/figure/janitor
|
||||
name = "Janitor action figure"
|
||||
/obj/item/toy/figure/crew/janitor
|
||||
name = "\improper Janitor action figure"
|
||||
desc = "The water-using Janitor, from Space Life's SS12 figurine collection."
|
||||
icon_state = "janitor"
|
||||
toysay = "Look at the signs, you idiot."
|
||||
|
||||
/obj/item/toy/figure/lawyer
|
||||
name = "Internal Affairs Agent action figure"
|
||||
/obj/item/toy/figure/crew/lawyer
|
||||
name = "\improper Internal Affairs Agent action figure"
|
||||
desc = "The unappreciated Internal Affairs Agent, from Space Life's SS12 figurine collection."
|
||||
icon_state = "lawyer"
|
||||
toysay = "Standard Operating Procedure says they're guilty! Hacking is proof they're an Enemy of the Corporation!"
|
||||
|
||||
/obj/item/toy/figure/librarian
|
||||
name = "Librarian action figure"
|
||||
/obj/item/toy/figure/crew/librarian
|
||||
name = "\improper Librarian action figure"
|
||||
desc = "The quiet Librarian, from Space Life's SS12 figurine collection."
|
||||
icon_state = "librarian"
|
||||
toysay = "One day while..."
|
||||
|
||||
/obj/item/toy/figure/md
|
||||
name = "Medical Doctor action figure"
|
||||
/obj/item/toy/figure/crew/md
|
||||
name = "\improper Medical Doctor action figure"
|
||||
desc = "The stressed-out doctor, from Space Life's SS12 figurine collection."
|
||||
icon_state = "md"
|
||||
toysay = "The patient is already dead!"
|
||||
|
||||
/obj/item/toy/figure/mime
|
||||
name = "Mime action figure"
|
||||
/obj/item/toy/figure/crew/mime
|
||||
name = "\improper Mime action figure"
|
||||
desc = "... from Space Life's SS12 figurine collection."
|
||||
icon_state = "mime"
|
||||
toysay = "..."
|
||||
|
||||
/obj/item/toy/figure/miner
|
||||
name = "Shaft Miner action figure"
|
||||
/obj/item/toy/figure/crew/miner
|
||||
name = "\improper Shaft Miner action figure"
|
||||
desc = "The gun-toting Shaft Miner, from Space Life's SS12 figurine collection."
|
||||
icon_state = "miner"
|
||||
toysay = "Oh god it's eating my intestines!"
|
||||
|
||||
/obj/item/toy/figure/ninja
|
||||
name = "Ninja action figure"
|
||||
/obj/item/toy/figure/crew/ninja
|
||||
name = "\improper Ninja action figure"
|
||||
desc = "It's the mysterious ninja! It's from Space Life's special edition SS12 figurine collection."
|
||||
icon_state = "ninja"
|
||||
toysay = "Oh god! Stop shooting, I'm friendly!"
|
||||
|
||||
/obj/item/toy/figure/wizard
|
||||
name = "Wizard action figure"
|
||||
/obj/item/toy/figure/crew/wizard
|
||||
name = "\improper Wizard action figure"
|
||||
desc = "It's the deadly, spell-slinging wizard! It's from Space Life's special edition SS12 figurine collection."
|
||||
icon_state = "wizard"
|
||||
toysay = "Ei Nath!"
|
||||
|
||||
/obj/item/toy/figure/rd
|
||||
name = "Research Director action figure"
|
||||
/obj/item/toy/figure/crew/rd
|
||||
name = "\improper Research Director action figure"
|
||||
desc = "The ambitious RD, from Space Life's SS12 figurine collection."
|
||||
icon_state = "rd"
|
||||
toysay = "Blowing all of the borgs!"
|
||||
|
||||
/obj/item/toy/figure/roboticist
|
||||
name = "Roboticist action figure"
|
||||
/obj/item/toy/figure/crew/roboticist
|
||||
name = "\improper Roboticist action figure"
|
||||
desc = "The skillful Roboticist, from Space Life's SS12 figurine collection."
|
||||
icon_state = "roboticist"
|
||||
toysay = "He asked to be borged!"
|
||||
|
||||
/obj/item/toy/figure/scientist
|
||||
name = "Scientist action figure"
|
||||
/obj/item/toy/figure/crew/scientist
|
||||
name = "\improper Scientist action figure"
|
||||
desc = "The mad Scientist, from Space Life's SS12 figurine collection."
|
||||
icon_state = "scientist"
|
||||
toysay = "Someone else must have made those bombs!"
|
||||
|
||||
/obj/item/toy/figure/syndie
|
||||
name = "Nuclear Operative action figure"
|
||||
/obj/item/toy/figure/crew/syndie
|
||||
name = "\improper Nuclear Operative action figure"
|
||||
desc = "It's the red-suited Nuclear Operative! It's from Space Life's special edition SS12 figurine collection."
|
||||
icon_state = "syndie"
|
||||
toysay = "Get that fucking disk!"
|
||||
|
||||
/obj/item/toy/figure/secofficer
|
||||
name = "Security Officer action figure"
|
||||
/obj/item/toy/figure/crew/secofficer
|
||||
name = "\improper Security Officer action figure"
|
||||
desc = "The power-tripping Security Officer, from Space Life's SS12 figurine collection."
|
||||
icon_state = "secofficer"
|
||||
toysay = "I am the law!"
|
||||
|
||||
/obj/item/toy/figure/virologist
|
||||
name = "Virologist action figure"
|
||||
/obj/item/toy/figure/crew/virologist
|
||||
name = "\improper Virologist action figure"
|
||||
desc = "The pandemic-starting Virologist, from Space Life's SS12 figurine collection."
|
||||
icon_state = "virologist"
|
||||
toysay = "It's not my virus!"
|
||||
|
||||
/obj/item/toy/figure/warden
|
||||
name = "Warden action figure"
|
||||
/obj/item/toy/figure/crew/warden
|
||||
name = "\improper Warden action figure"
|
||||
desc = "The amnesiac Warden, from Space Life's SS12 figurine collection."
|
||||
icon_state = "warden"
|
||||
toysay = "Execute him for breaking in!"
|
||||
|
||||
/*
|
||||
* Xenomorph action figure
|
||||
*/
|
||||
|
||||
/obj/item/toy/figure/xeno
|
||||
name = "\improper Xenomorph action figure"
|
||||
desc = "MEGA presents the new Xenos Isolated action figure! Comes complete with realistic sounds! Pull back string to use."
|
||||
icon_state = "toy_xeno"
|
||||
bubble_icon = "alien"
|
||||
cooldown_time = 5 SECONDS
|
||||
|
||||
|
||||
/obj/item/toy/figure/xeno/activate(mob/user)
|
||||
user.visible_message("<span class='notice'>[user] pulls back the string on [src].</span>")
|
||||
icon_state = "[initial(icon_state)]_used"
|
||||
addtimer(CALLBACK(src, .proc/hiss), 0.5 SECONDS)
|
||||
|
||||
/obj/item/toy/figure/xeno/proc/hiss()
|
||||
atom_say("Hiss!")
|
||||
playsound(src, get_sfx("hiss"), 50, TRUE)
|
||||
addtimer(CALLBACK(src, .proc/reset_icon), 4.5 SECONDS)
|
||||
|
||||
/obj/item/toy/figure/xeno/proc/reset_icon()
|
||||
icon_state = "[initial(icon_state)]"
|
||||
|
||||
/obj/item/toy/figure/xeno/on_cooldown(mob/user)
|
||||
to_chat(user, "<span class='warning'>The string on [src] hasn't rewound all the way!</span>")
|
||||
|
||||
/obj/item/toy/figure/owl
|
||||
name = "\improper Owl action figure"
|
||||
desc = "An action figure modeled after 'The Owl', defender of justice."
|
||||
icon_state = "owlprize"
|
||||
|
||||
/obj/item/toy/figure/owl/activate(mob/user)
|
||||
var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!")
|
||||
to_chat(user, "<span class='notice'>You pull the string on [src].</span>")
|
||||
playsound(src, 'sound/creatures/hoot.ogg', 25, TRUE)
|
||||
atom_say("<span class='danger'>[message]</span>")
|
||||
|
||||
/obj/item/toy/figure/griffin
|
||||
name = "\improper Griffin action figure"
|
||||
desc = "An action figure modeled after 'The Griffin', criminal mastermind."
|
||||
icon_state = "griffinprize"
|
||||
|
||||
|
||||
/obj/item/toy/figure/griffin/activate(mob/user)
|
||||
var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!")
|
||||
to_chat(user, "<span class='notice'>You pull the string on [src].</span>")
|
||||
playsound(src, 'sound/creatures/caw.ogg', 25, TRUE)
|
||||
atom_say("<span class='danger'>[message]</span>")
|
||||
|
||||
/*
|
||||
* Mech prizes
|
||||
*/
|
||||
/obj/item/toy/figure/mech
|
||||
icon_state = "ripleytoy"
|
||||
cooldown_time = 8
|
||||
|
||||
//all credit to skasi for toy mech fun ideas
|
||||
/obj/item/toy/figure/mech/activate(mob/user)
|
||||
to_chat(user, "<span class='notice'>You play with [src].</span>")
|
||||
playsound(src, 'sound/mecha/mechstep.ogg', 20, TRUE)
|
||||
|
||||
/obj/random/mech
|
||||
name = "Random Mech Prize"
|
||||
desc = "This is a random prize"
|
||||
icon = 'icons/obj/toy.dmi'
|
||||
icon_state = "ripleytoy"
|
||||
|
||||
/obj/random/mech/item_to_spawn()
|
||||
return pick(subtypesof(/obj/item/toy/figure/mech)) //exclude the base type.
|
||||
|
||||
/obj/item/toy/figure/mech/ripley
|
||||
name = "toy Ripley"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 1/11. This one is a ripley, a mining and engineering mecha."
|
||||
|
||||
/obj/item/toy/figure/mech/fireripley
|
||||
name = "toy Firefighting Ripley"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 2/11. This one is a firefighter ripley, a fireproof mining and engineering mecha."
|
||||
icon_state = "fireripleytoy"
|
||||
|
||||
/obj/item/toy/figure/mech/deathripley
|
||||
name = "toy Death Squad Ripley"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 3/11. This one is the black ripley used by the hero of DeathSquad, that TV drama about loose-cannon ERT officers!"
|
||||
icon_state = "deathripleytoy"
|
||||
|
||||
/obj/item/toy/figure/mech/gygax
|
||||
name = "toy Gygax"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 4/11. This one is the speedy gygax combat mecha. Zoom zoom, pew pew!"
|
||||
icon_state = "gygaxtoy"
|
||||
|
||||
/obj/item/toy/figure/mech/durand
|
||||
name = "toy Durand"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 5/11. This one is the heavy durand combat mecha. Stomp stomp!"
|
||||
icon_state = "durandprize"
|
||||
|
||||
/obj/item/toy/figure/mech/honk
|
||||
name = "toy H.O.N.K."
|
||||
desc = "Mini-Mecha action figure! Collect them all! 6/11. This one is the infamous H.O.N.K mech!"
|
||||
icon_state = "honkprize"
|
||||
|
||||
/obj/item/toy/figure/mech/marauder
|
||||
name = "toy Marauder"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 7/11. This one is the powerful marauder combat mecha! Run for cover!"
|
||||
icon_state = "marauderprize"
|
||||
|
||||
/obj/item/toy/figure/mech/seraph
|
||||
name = "toy Seraph"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 8/11. This one is the powerful seraph combat mecha! Someone's in trouble!"
|
||||
icon_state = "seraphprize"
|
||||
|
||||
/obj/item/toy/figure/mech/mauler
|
||||
name = "toy Mauler"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 9/11. This one is the deadly mauler combat mecha! Look out!"
|
||||
icon_state = "maulerprize"
|
||||
|
||||
/obj/item/toy/figure/mech/odysseus
|
||||
name = "toy Odysseus"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 10/11. This one is the spindly, syringe-firing odysseus medical mecha."
|
||||
icon_state = "odysseusprize"
|
||||
|
||||
/obj/item/toy/figure/mech/phazon
|
||||
name = "toy Phazon"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 11/11. This one is the mysterious Phazon combat mecha! Nobody's safe!"
|
||||
icon_state = "phazonprize"
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////
|
||||
// Magic 8-Ball / Conch //
|
||||
//////////////////////////////////////////////////////
|
||||
|
||||
@@ -91,8 +91,8 @@
|
||||
/obj/random/figure,
|
||||
/obj/item/toy/minimeteor,
|
||||
/obj/item/toy/redbutton,
|
||||
/obj/item/toy/owl,
|
||||
/obj/item/toy/griffin,
|
||||
/obj/item/toy/figure/owl,
|
||||
/obj/item/toy/figure/griffin,
|
||||
/obj/item/clothing/head/blob,
|
||||
/obj/item/id_decal/gold,
|
||||
/obj/item/id_decal/silver,
|
||||
|
||||
@@ -118,7 +118,6 @@
|
||||
new /obj/item/storage/lockbox/mindshield(src)
|
||||
new /obj/item/storage/box/flashbangs(src)
|
||||
new /obj/item/holosign_creator/security(src)
|
||||
new /obj/item/clothing/mask/gas/sechailer/hos(src)
|
||||
new /obj/item/shield/riot/tele(src)
|
||||
new /obj/item/melee/baton/loaded(src)
|
||||
new /obj/item/storage/belt/security/sec(src)
|
||||
|
||||
@@ -367,6 +367,23 @@
|
||||
newgas.temperature = target_temp
|
||||
return newgas
|
||||
|
||||
/obj/structure/closet/crate/freezer/iv_storage
|
||||
name = "IV storage freezer"
|
||||
desc = "A freezer used to store IV bags containing various blood types."
|
||||
|
||||
/obj/structure/closet/crate/freezer/iv_storage/populate_contents()
|
||||
new /obj/item/reagent_containers/iv_bag/blood/OMinus(src)
|
||||
new /obj/item/reagent_containers/iv_bag/blood/OPlus(src)
|
||||
new /obj/item/reagent_containers/iv_bag/blood/AMinus(src)
|
||||
new /obj/item/reagent_containers/iv_bag/blood/APlus(src)
|
||||
new /obj/item/reagent_containers/iv_bag/blood/BMinus(src)
|
||||
new /obj/item/reagent_containers/iv_bag/blood/BPlus(src)
|
||||
new /obj/item/reagent_containers/iv_bag/blood/random(src)
|
||||
new /obj/item/reagent_containers/iv_bag/blood/random(src)
|
||||
new /obj/item/reagent_containers/iv_bag/blood/random(src)
|
||||
new /obj/item/reagent_containers/iv_bag/salglu(src)
|
||||
new /obj/item/reagent_containers/iv_bag/slime(src)
|
||||
|
||||
/obj/structure/closet/crate/can
|
||||
desc = "A large can, looks like a bin to me."
|
||||
name = "garbage can"
|
||||
|
||||
@@ -286,33 +286,34 @@
|
||||
/obj/structure/sign/medbay/alt
|
||||
icon_state = "bluecross2"
|
||||
|
||||
/obj/structure/sign/directions
|
||||
name = "direction sign"
|
||||
|
||||
/obj/structure/sign/directions/bridge
|
||||
desc = "A direction sign, pointing out which way the Bridge is."
|
||||
icon_state = "direction_bridge"
|
||||
|
||||
/obj/structure/sign/directions/science
|
||||
name = "\improper Research Division"
|
||||
desc = "A direction sign, pointing out which way the Research Division is."
|
||||
icon_state = "direction_sci"
|
||||
|
||||
/obj/structure/sign/directions/engineering
|
||||
name = "\improper Engineering Department"
|
||||
desc = "A direction sign, pointing out which way the Engineering Department is."
|
||||
icon_state = "direction_eng"
|
||||
|
||||
/obj/structure/sign/directions/security
|
||||
name = "\improper Security Department"
|
||||
desc = "A direction sign, pointing out which way the Security Department is."
|
||||
icon_state = "direction_sec"
|
||||
|
||||
/obj/structure/sign/directions/medical
|
||||
name = "\improper Medical Bay"
|
||||
desc = "A direction sign, pointing out which way Medical Bay is."
|
||||
desc = "A direction sign, pointing out which way the Medical Bay is."
|
||||
icon_state = "direction_med"
|
||||
|
||||
/obj/structure/sign/directions/evac
|
||||
name = "\improper Escape Arm"
|
||||
desc = "A direction sign, pointing out which way Escape Shuttle Dock is."
|
||||
desc = "A direction sign, pointing out which way the Escape Shuttle Dock is."
|
||||
icon_state = "direction_evac"
|
||||
|
||||
/obj/structure/sign/directions/cargo
|
||||
name = "\improper Cargo Department"
|
||||
desc = "A direction sign, pointing out which way the Cargo Department is."
|
||||
icon_state = "direction_supply"
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/tatortot,
|
||||
/obj/item/storage/box/fakesyndiesuit,
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
|
||||
/obj/item/toy/figure/syndie,
|
||||
/obj/item/toy/figure/crew/syndie,
|
||||
/obj/item/toy/nuke,
|
||||
/obj/item/toy/plushie/nukeplushie,
|
||||
/obj/item/toy/sword,
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
var/opening = 0
|
||||
var/possible_contents = list(/obj/random/carp_plushie, /obj/random/plushie, /obj/random/figure, /obj/item/toy/eight_ball, /obj/item/stack/tickets)
|
||||
|
||||
/obj/item/toy/prizeball/New()
|
||||
..()
|
||||
/obj/item/toy/prizeball/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = pick("prizeball_1","prizeball_2","prizeball_3")
|
||||
|
||||
/obj/item/toy/prizeball/attack_self(mob/user as mob)
|
||||
|
||||
@@ -200,7 +200,7 @@ GLOBAL_DATUM_INIT(global_prizes, /datum/prizes, new())
|
||||
/datum/prize_item/toy_xeno
|
||||
name = "Xeno Action Figure"
|
||||
desc = "A lifelike replica of the horrific xeno scourge."
|
||||
typepath = /obj/item/toy/toy_xeno
|
||||
typepath = /obj/item/toy/figure/xeno
|
||||
cost = 80
|
||||
|
||||
/datum/prize_item/rubberducky
|
||||
@@ -272,13 +272,13 @@ GLOBAL_DATUM_INIT(global_prizes, /datum/prizes, new())
|
||||
/datum/prize_item/owl
|
||||
name = "Owl Action Figure"
|
||||
desc = "Remember: heroes don't grief!"
|
||||
typepath = /obj/item/toy/owl
|
||||
typepath = /obj/item/toy/figure/owl
|
||||
cost = 125
|
||||
|
||||
/datum/prize_item/griffin
|
||||
name = "Griffin Action Figure"
|
||||
desc = "If you can't be the best, you can always be the WORST."
|
||||
typepath = /obj/item/toy/griffin
|
||||
typepath = /obj/item/toy/figure/griffin
|
||||
cost = 125
|
||||
|
||||
/datum/prize_item/codex_gigas
|
||||
|
||||
@@ -327,6 +327,10 @@
|
||||
var/recharging_rate = 60 //default 6 seconds between each dash
|
||||
var/recharging_time = 0 //time until next dash
|
||||
|
||||
/obj/item/clothing/shoes/bhop/item_action_slot_check(slot)
|
||||
if(slot == slot_shoes)
|
||||
return TRUE
|
||||
|
||||
/obj/item/clothing/shoes/bhop/ui_action_click(mob/user, action)
|
||||
if(!isliving(user))
|
||||
return
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
if(53 to 54)
|
||||
new /obj/item/toy/balloon(src)
|
||||
if(55 to 56)
|
||||
var/newitem = pick(subtypesof(/obj/item/toy/prize))
|
||||
var/newitem = pick(subtypesof(/obj/item/toy/figure/mech))
|
||||
new newitem(src)
|
||||
if(57 to 58)
|
||||
new /obj/item/toy/syndicateballoon(src)
|
||||
|
||||
@@ -404,6 +404,10 @@
|
||||
/mob/living/carbon/proc/tintcheck()
|
||||
return 0
|
||||
|
||||
/mob/living/carbon/proc/create_dna()
|
||||
if(!dna)
|
||||
dna = new()
|
||||
|
||||
/mob/living/carbon/proc/getDNA()
|
||||
return dna
|
||||
|
||||
|
||||
@@ -14,38 +14,47 @@
|
||||
. = ..()
|
||||
|
||||
/mob/living/carbon/human/Initialize(mapload, datum/species/new_species = /datum/species/human)
|
||||
if(!dna)
|
||||
dna = new /datum/dna(null)
|
||||
// Species name is handled by set_species()
|
||||
create_dna()
|
||||
|
||||
. = ..()
|
||||
|
||||
set_species(new_species, 1, delay_icon_update = 1, skip_same_check = TRUE)
|
||||
|
||||
if(dna.species)
|
||||
real_name = dna.species.get_random_name(gender)
|
||||
name = real_name
|
||||
if(mind)
|
||||
mind.name = real_name
|
||||
|
||||
create_reagents(330)
|
||||
|
||||
handcrafting = new()
|
||||
|
||||
// Set up DNA.
|
||||
if(dna)
|
||||
dna.ready_dna(src)
|
||||
dna.real_name = real_name
|
||||
sync_organ_dna(1)
|
||||
|
||||
physiology = new()
|
||||
|
||||
AddComponent(/datum/component/footstep, FOOTSTEP_MOB_HUMAN, 1, -6)
|
||||
setup_dna(new_species)
|
||||
setup_other()
|
||||
|
||||
UpdateAppearance()
|
||||
GLOB.human_list += src
|
||||
|
||||
/**
|
||||
* Sets up DNA and species.
|
||||
*
|
||||
* Arguments:
|
||||
* * new_species - The new species to assign.
|
||||
*/
|
||||
/mob/living/carbon/human/proc/setup_dna(datum/species/new_species)
|
||||
set_species(new_species, use_default_color = TRUE, delay_icon_update = TRUE, skip_same_check = TRUE)
|
||||
// Name
|
||||
real_name = dna.species.get_random_name(gender)
|
||||
name = real_name
|
||||
if(mind)
|
||||
mind.name = real_name
|
||||
// DNA ready
|
||||
dna.ready_dna(src)
|
||||
dna.real_name = real_name
|
||||
sync_organ_dna()
|
||||
|
||||
/**
|
||||
* Sets up other variables and components that may be needed for gameplay.
|
||||
*/
|
||||
/mob/living/carbon/human/proc/setup_other()
|
||||
create_reagents(330)
|
||||
physiology = new()
|
||||
|
||||
/mob/living/carbon/human/ComponentInitialize()
|
||||
AddComponent(/datum/component/footstep, FOOTSTEP_MOB_HUMAN, 1, -6)
|
||||
|
||||
/mob/living/carbon/human/OpenCraftingMenu()
|
||||
if(!handcrafting)
|
||||
handcrafting = new()
|
||||
handcrafting.ui_interact(src)
|
||||
|
||||
/mob/living/carbon/human/prepare_data_huds()
|
||||
@@ -1211,7 +1220,7 @@
|
||||
sec_hud_set_ID()
|
||||
|
||||
|
||||
/mob/living/carbon/human/proc/set_species(datum/species/new_species, default_colour, delay_icon_update = FALSE, skip_same_check = FALSE, retain_damage = FALSE, transformation = FALSE)
|
||||
/mob/living/carbon/human/proc/set_species(datum/species/new_species, use_default_color = FALSE, delay_icon_update = FALSE, skip_same_check = FALSE, retain_damage = FALSE, transformation = FALSE)
|
||||
if(!skip_same_check)
|
||||
if(dna.species.name == initial(new_species.name))
|
||||
return
|
||||
@@ -1246,7 +1255,7 @@
|
||||
hunger_drain = dna.species.hunger_drain
|
||||
digestion_ratio = dna.species.digestion_ratio
|
||||
|
||||
if(dna.species.base_color && default_colour)
|
||||
if(dna.species.base_color && use_default_color)
|
||||
//Apply colour.
|
||||
skin_colour = dna.species.base_color
|
||||
else
|
||||
|
||||
@@ -416,7 +416,11 @@
|
||||
/obj/item/clothing/mask/gas/sechailer/cyborg
|
||||
)
|
||||
emag_modules = list(/obj/item/gun/energy/laser/cyborg)
|
||||
special_rechargables = list(/obj/item/melee/baton/loaded, /obj/item/gun/energy/disabler/cyborg)
|
||||
special_rechargables = list(
|
||||
/obj/item/melee/baton/loaded,
|
||||
/obj/item/gun/energy/disabler/cyborg,
|
||||
/obj/item/gun/energy/laser/cyborg
|
||||
)
|
||||
|
||||
/obj/item/robot_module/security/update_cells(unlink_cell = FALSE)
|
||||
var/obj/item/melee/baton/B = locate(/obj/item/melee/baton/loaded) in modules
|
||||
|
||||
@@ -203,3 +203,12 @@
|
||||
var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot
|
||||
if(R.cell.use(shot.e_cost)) //Take power from the borg...
|
||||
cell.give(shot.e_cost) //... to recharge the shot
|
||||
|
||||
/obj/item/gun/energy/cyborg_recharge(coeff, emagged)
|
||||
if(cell.charge < cell.maxcharge)
|
||||
var/obj/item/ammo_casing/energy/E = ammo_type[select]
|
||||
cell.give(E.e_cost * coeff)
|
||||
on_recharge()
|
||||
update_icon()
|
||||
else
|
||||
charge_tick = 0
|
||||
|
||||
@@ -55,12 +55,3 @@
|
||||
/obj/item/gun/energy/disabler/cyborg/newshot()
|
||||
..()
|
||||
robocharge()
|
||||
|
||||
/obj/item/gun/energy/disabler/cyborg/cyborg_recharge(coeff, emagged)
|
||||
if(cell.charge < cell.maxcharge)
|
||||
var/obj/item/ammo_casing/energy/E = ammo_type[select]
|
||||
cell.give(E.e_cost * coeff)
|
||||
on_recharge()
|
||||
update_icon()
|
||||
else
|
||||
charge_tick = 0
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 924 KiB After Width: | Height: | Size: 933 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 23 KiB |
Reference in New Issue
Block a user