mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-18 03:26:31 +01:00
More evac shuttles 2 (#5669)
## About The Pull Request Adds a couple really expensive shuttles. - The gold version of Oh Hi Daniel, being a joke and expensive but not nearly as expensive as - The Vigilante, a long-range syndicate transport shuttle with a cosy layout and also some mobs and a sentience balloon. (Also contains a unique weapon) - The Millionaire Shuttle, a very gold shuttle that's supposed to feel fancy, and also it has some silly custom items. Also adds a "medical bay" pod to the cluster of escape pods, along with making it require an emagged console. Also reduces the breacher's price considering that in hindsight it's not _that_ good of a shuttle. ## Why It's Good For The Game The last time I made some shuttles people kinda liked them, so I decided to make a couple more. ## Proof Of Testing Shuttles are able to be bought and they work just fine. StrongDMM screenshots follow: Gold Daniel - <img width="320" height="352" alt="image" src="https://github.com/user-attachments/assets/cbd57b08-35f3-47e3-929e-629f6a59fd00" /> Vigilante - <img width="896" height="1376" alt="image" src="https://github.com/user-attachments/assets/f5f66209-7271-45b8-938b-4cbad8fbf3ac" /> Millionaire - <img width="608" height="1184" alt="image" src="https://github.com/user-attachments/assets/cd28f2a9-2241-4e01-8516-e8e644a451e0" /> ## Changelog 🆑 add: Adds a couple more dumb expensive evac shuttles. balance: Makes the escape pod cluster shuttle emag only. /🆑 --------- Co-authored-by: Cabbage <supredoode@gmail.com>
This commit is contained in:
Cabbage
@@ -0,0 +1,506 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"aN" = (
|
||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||
/obj/effect/decal/cleanable/confetti,
|
||||
/obj/effect/turf_decal/siding/thinplating/light{
|
||||
color = "#ffd500";
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/mineral/diamond,
|
||||
/area/shuttle/escape)
|
||||
"cN" = (
|
||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||
/obj/effect/decal/cleanable/confetti,
|
||||
/turf/open/floor/mineral/diamond,
|
||||
/area/shuttle/escape)
|
||||
"ej" = (
|
||||
/obj/structure/chair/plastic{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/decal/cleanable/confetti,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"hs" = (
|
||||
/obj/structure/chair/plastic{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"kf" = (
|
||||
/obj/structure/curtain/cloth,
|
||||
/obj/effect/spawner/structure/window/hollow/plasma,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"kW" = (
|
||||
/obj/item/toy/balloon,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"lh" = (
|
||||
/obj/structure/fireplace,
|
||||
/obj/structure/chair/comfy/beige{
|
||||
color = "#ffd500"
|
||||
},
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"lI" = (
|
||||
/obj/structure/mineral_door/gold,
|
||||
/turf/open/floor/mineral/silver,
|
||||
/area/shuttle/escape)
|
||||
"oo" = (
|
||||
/obj/structure/chair/comfy/beige{
|
||||
dir = 8;
|
||||
color = "#ffd500";
|
||||
custom_materials = list(/datum/material/gold = 200)
|
||||
},
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"qE" = (
|
||||
/obj/effect/decal/cleanable/confetti,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"qL" = (
|
||||
/obj/structure/chair/sofa/left{
|
||||
dir = 1;
|
||||
color = "#ffd500";
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"qY" = (
|
||||
/obj/structure/sink/kitchen/directional/east{
|
||||
color = "#ffd500";
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/obj/structure/mirror/directional/west,
|
||||
/obj/item/stack/sheet/mineral/gold/fifty{
|
||||
pixel_y = -4;
|
||||
pixel_x = -4
|
||||
},
|
||||
/obj/item/stack/sheet/mineral/gold/fifty{
|
||||
pixel_y = -4;
|
||||
pixel_x = 4
|
||||
},
|
||||
/obj/item/stack/sheet/mineral/gold/fifty,
|
||||
/turf/open/floor/mineral/silver,
|
||||
/area/shuttle/escape)
|
||||
"rT" = (
|
||||
/obj/structure/dresser,
|
||||
/obj/structure/railing{
|
||||
dir = 4;
|
||||
color = "#ffd500";
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"si" = (
|
||||
/obj/machinery/vending/cola/black,
|
||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||
/obj/effect/turf_decal/siding/thinplating/light{
|
||||
color = "#ffd500";
|
||||
dir = 9
|
||||
},
|
||||
/turf/open/floor/mineral/diamond,
|
||||
/area/shuttle/escape)
|
||||
"st" = (
|
||||
/obj/docking_port/mobile/emergency{
|
||||
name = "How's your sex life (Turbo Gold Premium Supporter's Edition)"
|
||||
},
|
||||
/obj/machinery/door/airlock/gold,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"tD" = (
|
||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||
/obj/machinery/light/small/directional/west,
|
||||
/obj/item/toy/balloon,
|
||||
/obj/effect/turf_decal/siding/thinplating/light{
|
||||
color = "#ffd500";
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/mineral/diamond,
|
||||
/area/shuttle/escape)
|
||||
"tP" = (
|
||||
/obj/item/toy/balloon,
|
||||
/obj/effect/decal/cleanable/confetti,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"tX" = (
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"uW" = (
|
||||
/obj/structure/chair/office{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"vG" = (
|
||||
/obj/structure/bed/double,
|
||||
/obj/structure/curtain/cloth,
|
||||
/obj/item/bedsheet/hos/double,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"wk" = (
|
||||
/obj/structure/table/reinforced{
|
||||
color = "#ffd500";
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/obj/item/reagent_containers/cup/glass/shaker,
|
||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||
/obj/effect/turf_decal/siding/thinplating/light{
|
||||
color = "#ffd500";
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/mineral/diamond,
|
||||
/area/shuttle/escape)
|
||||
"wJ" = (
|
||||
/obj/structure/chair/sofa/right{
|
||||
color = "#ffd500";
|
||||
dir = 1;
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"xo" = (
|
||||
/obj/machinery/light/small/directional/south,
|
||||
/obj/item/toy/balloon,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"xL" = (
|
||||
/obj/machinery/computer/security/wooden_tv,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"xQ" = (
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"yi" = (
|
||||
/obj/structure/mirror/broken/directional/west,
|
||||
/obj/item/table_clock,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"yE" = (
|
||||
/obj/structure/fake_stairs/directional/north{
|
||||
color = "#ffd500"
|
||||
},
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"zV" = (
|
||||
/obj/item/reagent_containers/cup/glass/coffee{
|
||||
pixel_x = 7;
|
||||
pixel_y = 14
|
||||
},
|
||||
/obj/item/reagent_containers/cup/glass/coffee/no_lid{
|
||||
pixel_x = -5;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/item/storage/box/party_poppers{
|
||||
pixel_x = 8
|
||||
},
|
||||
/obj/structure/table/wood/fancy/royalblack,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"AQ" = (
|
||||
/obj/structure/chair/sofa/right{
|
||||
color = "#ffd500";
|
||||
dir = 1;
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"Dm" = (
|
||||
/obj/item/kirbyplants,
|
||||
/obj/item/toy/balloon,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"Ed" = (
|
||||
/obj/item/kirbyplants,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"FX" = (
|
||||
/obj/item/flashlight/lamp,
|
||||
/obj/structure/table/wood/fancy/royalblack,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"HO" = (
|
||||
/obj/machinery/computer/libraryconsole/bookmanagement,
|
||||
/obj/structure/table/wood/fancy/royalblack,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"Id" = (
|
||||
/obj/structure/table/reinforced{
|
||||
color = "#ffd500";
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
|
||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||
/obj/effect/turf_decal/siding/thinplating/light{
|
||||
color = "#ffd500";
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/mineral/diamond,
|
||||
/area/shuttle/escape)
|
||||
"Kf" = (
|
||||
/obj/structure/rack/shelf,
|
||||
/obj/machinery/light/small/directional/east,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"Lf" = (
|
||||
/obj/item/clothing/gloves/tackler/football,
|
||||
/obj/structure/table/wood/fancy/royalblack,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"Lm" = (
|
||||
/obj/item/paper/fluff/shuttles/daniel,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"LJ" = (
|
||||
/obj/structure/toilet/secret{
|
||||
color = "#ffd500";
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/obj/machinery/light/small/directional/west,
|
||||
/obj/item/stack/sheet/mineral/gold/fifty{
|
||||
pixel_y = -4;
|
||||
pixel_x = 4
|
||||
},
|
||||
/obj/item/stack/sheet/mineral/gold/fifty{
|
||||
pixel_y = -4;
|
||||
pixel_x = -4
|
||||
},
|
||||
/obj/item/stack/sheet/mineral/gold/fifty,
|
||||
/turf/open/floor/mineral/silver,
|
||||
/area/shuttle/escape)
|
||||
"LK" = (
|
||||
/obj/item/stack/spacecash/c1{
|
||||
amount = 8
|
||||
},
|
||||
/obj/item/stack/spacecash/c10,
|
||||
/obj/structure/table/wood/fancy/royalblack,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"Mk" = (
|
||||
/obj/structure/chair/sofa/left{
|
||||
dir = 1;
|
||||
color = "#ffd500";
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"Mo" = (
|
||||
/obj/item/reagent_containers/cup/glass/bottle/wine{
|
||||
pixel_y = 7
|
||||
},
|
||||
/obj/structure/table/wood/fancy/royalblack,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"MI" = (
|
||||
/obj/machinery/light/small/directional/east,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"MX" = (
|
||||
/obj/structure/bed/dogbed,
|
||||
/obj/item/bouquet/rose,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"Nf" = (
|
||||
/obj/item/reagent_containers/cup/glass/waterbottle/empty,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"Ng" = (
|
||||
/obj/machinery/computer/emergency_shuttle,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"OX" = (
|
||||
/obj/machinery/light/small/directional/west,
|
||||
/mob/living/basic/chicken{
|
||||
name = "Peter";
|
||||
real_name = "Peter"
|
||||
},
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"RV" = (
|
||||
/turf/closed/wall/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"SQ" = (
|
||||
/obj/structure/curtain/cloth{
|
||||
color = "#AA4444"
|
||||
},
|
||||
/obj/effect/spawner/structure/window/hollow/plasma,
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
"Um" = (
|
||||
/obj/structure/table/reinforced{
|
||||
color = "#ffd500";
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||
/obj/item/pizzabox/meat{
|
||||
pizza = /obj/item/food/pizza/arnold;
|
||||
pixel_y = 10
|
||||
},
|
||||
/obj/effect/turf_decal/siding/thinplating/light{
|
||||
color = "#ffd500"
|
||||
},
|
||||
/turf/open/floor/mineral/diamond,
|
||||
/area/shuttle/escape)
|
||||
"VQ" = (
|
||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||
/obj/effect/turf_decal/siding/thinplating/light{
|
||||
color = "#ffd500";
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/mineral/diamond,
|
||||
/area/shuttle/escape)
|
||||
"VU" = (
|
||||
/obj/effect/mob_spawn/corpse/human,
|
||||
/obj/item/food/cakeslice/birthday,
|
||||
/obj/effect/decal/cleanable/blood,
|
||||
/obj/item/gun/ballistic/revolver/golden,
|
||||
/turf/open/floor/carpet/royalblack,
|
||||
/area/shuttle/escape)
|
||||
"Zl" = (
|
||||
/obj/structure/table/reinforced{
|
||||
color = "#ffd500";
|
||||
custom_materials = list(/datum/material/gold = 100)
|
||||
},
|
||||
/obj/item/food/cake/birthday,
|
||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||
/obj/item/knife/kitchen,
|
||||
/obj/effect/turf_decal/siding/thinplating/light{
|
||||
color = "#ffd500";
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/mineral/diamond,
|
||||
/area/shuttle/escape)
|
||||
"ZN" = (
|
||||
/turf/open/floor/mineral/gold,
|
||||
/area/shuttle/escape)
|
||||
|
||||
(1,1,1) = {"
|
||||
xQ
|
||||
xQ
|
||||
xQ
|
||||
xQ
|
||||
RV
|
||||
RV
|
||||
RV
|
||||
RV
|
||||
st
|
||||
RV
|
||||
RV
|
||||
"}
|
||||
(2,1,1) = {"
|
||||
xQ
|
||||
xQ
|
||||
xQ
|
||||
xQ
|
||||
RV
|
||||
si
|
||||
tD
|
||||
Zl
|
||||
qE
|
||||
Dm
|
||||
RV
|
||||
"}
|
||||
(3,1,1) = {"
|
||||
xQ
|
||||
RV
|
||||
RV
|
||||
RV
|
||||
RV
|
||||
wk
|
||||
cN
|
||||
Um
|
||||
kW
|
||||
ej
|
||||
RV
|
||||
"}
|
||||
(4,1,1) = {"
|
||||
xQ
|
||||
RV
|
||||
LJ
|
||||
qY
|
||||
RV
|
||||
Id
|
||||
VQ
|
||||
aN
|
||||
tP
|
||||
zV
|
||||
RV
|
||||
"}
|
||||
(5,1,1) = {"
|
||||
RV
|
||||
RV
|
||||
RV
|
||||
lI
|
||||
RV
|
||||
RV
|
||||
RV
|
||||
HO
|
||||
uW
|
||||
hs
|
||||
RV
|
||||
"}
|
||||
(6,1,1) = {"
|
||||
RV
|
||||
Ng
|
||||
yi
|
||||
tX
|
||||
OX
|
||||
Mk
|
||||
RV
|
||||
MX
|
||||
tX
|
||||
xo
|
||||
RV
|
||||
"}
|
||||
(7,1,1) = {"
|
||||
SQ
|
||||
tX
|
||||
VU
|
||||
Lm
|
||||
ZN
|
||||
AQ
|
||||
RV
|
||||
lh
|
||||
LK
|
||||
qL
|
||||
RV
|
||||
"}
|
||||
(8,1,1) = {"
|
||||
RV
|
||||
tX
|
||||
vG
|
||||
oo
|
||||
Nf
|
||||
rT
|
||||
RV
|
||||
xL
|
||||
Mo
|
||||
wJ
|
||||
kf
|
||||
"}
|
||||
(9,1,1) = {"
|
||||
RV
|
||||
Lf
|
||||
Kf
|
||||
FX
|
||||
MI
|
||||
yE
|
||||
yE
|
||||
MI
|
||||
ZN
|
||||
Ed
|
||||
RV
|
||||
"}
|
||||
(10,1,1) = {"
|
||||
RV
|
||||
RV
|
||||
RV
|
||||
kf
|
||||
RV
|
||||
RV
|
||||
RV
|
||||
RV
|
||||
kf
|
||||
RV
|
||||
RV
|
||||
"}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -17,6 +17,15 @@
|
||||
/obj/machinery/power/shuttle_engine/propulsion/burst,
|
||||
/turf/closed/wall/mineral/titanium,
|
||||
/area/shuttle/escape)
|
||||
"g" = (
|
||||
/obj/machinery/computer/operating,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"i" = (
|
||||
/obj/structure/rack,
|
||||
/obj/item/storage/medkit/o2,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"j" = (
|
||||
/obj/structure/chair/comfy/black{
|
||||
dir = 1
|
||||
@@ -40,6 +49,30 @@
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/escape)
|
||||
"o" = (
|
||||
/obj/structure/chair/comfy/shuttle{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/decorative{
|
||||
icon = 'icons/obj/machines/wallmounts.dmi';
|
||||
icon_state = "pod_off";
|
||||
pixel_x = -32;
|
||||
name = "pod control computer";
|
||||
desc = "A computer used to control an escape pod. Looks like it's linked up with an emergency console to avoid independant launch."
|
||||
},
|
||||
/obj/structure/decorative{
|
||||
icon = 'icons/obj/machines/wallmounts.dmi';
|
||||
icon_state = "pod_on";
|
||||
pixel_x = -32;
|
||||
name = "pod control computer";
|
||||
desc = "A computer used to control an escape pod. Looks like it's linked up with an emergency console to avoid independant launch."
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"r" = (
|
||||
/obj/item/reagent_containers/hypospray/medipen,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"v" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
@@ -52,10 +85,21 @@
|
||||
/obj/item/radio/intercom/directional/south,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"z" = (
|
||||
/obj/structure/table/optable,
|
||||
/obj/machinery/vitals_reader/advanced/directional/north,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"B" = (
|
||||
/obj/effect/spawner/structure/window/reinforced/shuttle,
|
||||
/turf/open/floor/plating,
|
||||
/area/shuttle/escape)
|
||||
"C" = (
|
||||
/obj/machinery/light/small/directional/south,
|
||||
/obj/item/storage/pod/directional/south,
|
||||
/obj/item/radio/intercom/directional/south,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"E" = (
|
||||
/obj/machinery/door/airlock/titanium{
|
||||
name = "Escape Pod Airlock"
|
||||
@@ -64,6 +108,21 @@
|
||||
/obj/effect/mapping_helpers/airlock/access/all/command/general,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"F" = (
|
||||
/obj/machinery/stasis,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"I" = (
|
||||
/obj/item/vending_refill/wallmed{
|
||||
pixel_y = 10
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"L" = (
|
||||
/obj/item/storage/box/medipens/utility,
|
||||
/obj/machinery/vending/wallmed/directional/east,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"M" = (
|
||||
/obj/machinery/computer/emergency_shuttle,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
@@ -78,6 +137,14 @@
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"P" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/storage/medkit/brute{
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/storage/medkit/fire,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"R" = (
|
||||
/obj/structure/chair/comfy/shuttle{
|
||||
dir = 1
|
||||
@@ -99,6 +166,12 @@
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"S" = (
|
||||
/obj/item/stack/rods/two{
|
||||
pixel_y = 10
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"T" = (
|
||||
/obj/structure/table/wood/fancy/black,
|
||||
/obj/item/flashlight/flare/candle{
|
||||
@@ -118,6 +191,22 @@
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
"V" = (
|
||||
/obj/structure/chair/comfy/shuttle{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light/small/directional/south,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"X" = (
|
||||
/obj/machinery/status_display/evac/directional/east,
|
||||
/obj/structure/table/reinforced/titaniumglass,
|
||||
/obj/effect/spawner/surgery_tray/full,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"Y" = (
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
|
||||
(1,1,1) = {"
|
||||
v
|
||||
@@ -286,7 +375,7 @@ v
|
||||
v
|
||||
v
|
||||
v
|
||||
b
|
||||
m
|
||||
v
|
||||
a
|
||||
a
|
||||
@@ -319,7 +408,7 @@ v
|
||||
v
|
||||
v
|
||||
B
|
||||
R
|
||||
o
|
||||
w
|
||||
a
|
||||
v
|
||||
@@ -349,8 +438,8 @@ v
|
||||
v
|
||||
v
|
||||
a
|
||||
a
|
||||
c
|
||||
i
|
||||
Y
|
||||
d
|
||||
v
|
||||
v
|
||||
@@ -376,14 +465,14 @@ R
|
||||
w
|
||||
a
|
||||
v
|
||||
v
|
||||
v
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
a
|
||||
a
|
||||
a
|
||||
P
|
||||
S
|
||||
a
|
||||
c
|
||||
d
|
||||
b
|
||||
b
|
||||
v
|
||||
@@ -406,18 +495,18 @@ a
|
||||
c
|
||||
d
|
||||
v
|
||||
B
|
||||
R
|
||||
V
|
||||
L
|
||||
I
|
||||
r
|
||||
w
|
||||
a
|
||||
a
|
||||
c
|
||||
d
|
||||
v
|
||||
v
|
||||
v
|
||||
v
|
||||
b
|
||||
v
|
||||
v
|
||||
v
|
||||
"}
|
||||
(11,1,1) = {"
|
||||
v
|
||||
@@ -436,16 +525,16 @@ v
|
||||
b
|
||||
v
|
||||
v
|
||||
B
|
||||
R
|
||||
w
|
||||
a
|
||||
v
|
||||
v
|
||||
a
|
||||
a
|
||||
c
|
||||
d
|
||||
a
|
||||
g
|
||||
Y
|
||||
F
|
||||
a
|
||||
v
|
||||
b
|
||||
v
|
||||
v
|
||||
"}
|
||||
@@ -466,16 +555,16 @@ b
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
a
|
||||
z
|
||||
Y
|
||||
a
|
||||
c
|
||||
d
|
||||
v
|
||||
v
|
||||
B
|
||||
R
|
||||
w
|
||||
a
|
||||
b
|
||||
v
|
||||
v
|
||||
"}
|
||||
@@ -496,16 +585,16 @@ v
|
||||
v
|
||||
v
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
v
|
||||
v
|
||||
v
|
||||
b
|
||||
B
|
||||
X
|
||||
C
|
||||
a
|
||||
a
|
||||
c
|
||||
d
|
||||
v
|
||||
v
|
||||
b
|
||||
v
|
||||
v
|
||||
"}
|
||||
@@ -529,11 +618,11 @@ c
|
||||
d
|
||||
v
|
||||
b
|
||||
a
|
||||
a
|
||||
c
|
||||
d
|
||||
b
|
||||
m
|
||||
v
|
||||
v
|
||||
v
|
||||
b
|
||||
b
|
||||
b
|
||||
@@ -561,9 +650,9 @@ v
|
||||
v
|
||||
v
|
||||
b
|
||||
v
|
||||
v
|
||||
v
|
||||
b
|
||||
b
|
||||
b
|
||||
a
|
||||
a
|
||||
c
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -71,6 +71,7 @@
|
||||
admin_notes = "No air between pods. Command pod is slightly longer to fit the console. Funny idea courtesy of a friend."
|
||||
credit_cost = CARGO_CRATE_VALUE * 1.5
|
||||
occupancy_limit = "36"
|
||||
emag_only = TRUE
|
||||
|
||||
/datum/map_template/shuttle/emergency/stockade
|
||||
prefix = "_maps/shuttles/zubbers/"
|
||||
@@ -78,5 +79,35 @@
|
||||
name = "Breacher-Class Stockade Shuttle"
|
||||
description = "This older Nanotrasen Breacher-class Stockade Shuttle makes up for it's lack of shields and advanced technologies with absolute heft and durability. Sporting an incredibly up-armored hull, laser defence turrets and an asteroid plow, there's not much that's going to get through this beast of a ship."
|
||||
admin_notes = "Big and chonky, where every door is a secure door. Features turrets used on the Raven shuttle. Not terribly special otherwise."
|
||||
credit_cost = CARGO_CRATE_VALUE * 125
|
||||
credit_cost = CARGO_CRATE_VALUE * 100
|
||||
occupancy_limit = "80"
|
||||
|
||||
/datum/map_template/shuttle/emergency/imfedupbutgold
|
||||
prefix = "_maps/shuttles/zubbers/"
|
||||
suffix = "imfedupbutgold"
|
||||
name = "How's your sex life (Turbo Gold Premium Supporter's Edition)"
|
||||
description = "You can love someone deep inside your heart, and there is nothing wrong with it. If a lot of people love each other, the world would be a better place to live. Now with more gold."
|
||||
admin_notes = "People will hate you if you buy this."
|
||||
occupancy_limit = "5"
|
||||
emag_only = TRUE
|
||||
credit_cost = CARGO_CRATE_VALUE * 1250
|
||||
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
|
||||
|
||||
/datum/map_template/shuttle/emergency/vigilante
|
||||
prefix = "_maps/shuttles/zubbers/"
|
||||
suffix = "vigilante"
|
||||
name = "SLRSV Vigilante"
|
||||
description = "A long-distance transport straight from the Syndicate. The Syndicate Long-Range Support Vessel Vigilante is equipped with high passenger capacity, stocked support departments, as well as crew amenities. While it may not have the luxuries of some other shuttles, this baby is made to last and will guarantee your safe travel. Note: please do not pick fights with the Shipmaster, he refused to leave when we put the vessel up for sale."
|
||||
admin_notes = "Big bucks syndicate ship. Not nearly as much contraband as you'd expect, but there are several syndicate modsuits and softsuits. Comes with some a sentience fun balloon for the couple mobs aboard. Also contains the beanbag bulldog."
|
||||
occupancy_limit = "90"
|
||||
emag_only = TRUE
|
||||
credit_cost = CARGO_CRATE_VALUE * 1000
|
||||
|
||||
/datum/map_template/shuttle/emergency/millionaire
|
||||
prefix = "_maps/shuttles/zubbers/"
|
||||
suffix = "millionaire"
|
||||
name = "Millionaire Shuttle"
|
||||
description = "An excessively expensive shuttle made of (almost) solid gold, silver and diamonds. If you can to afford to buy this, your station will forever be immortalized on the 'list of millions'. Note: List may or may not exist. Note: May also crash into station."
|
||||
admin_notes = "Nice job getting a million. Enjoy the dumb shuttle."
|
||||
occupancy_limit = "55"
|
||||
credit_cost = 1000000
|
||||
|
||||
@@ -29,3 +29,17 @@
|
||||
new /obj/item/clothing/accessory/medal/bubber/syndicate/intelligence(src)
|
||||
new /obj/item/clothing/accessory/medal/bubber/syndicate/diligence(src)
|
||||
new /obj/item/clothing/accessory/medal/bubber/syndicate/communications(src)
|
||||
|
||||
/obj/item/storage/box/papersack/millionaire_bonus
|
||||
name = "bonus sack"
|
||||
desc = "A small bag of goodies awarded to employees."
|
||||
design_choice = "NanotrasenStandard"
|
||||
|
||||
/obj/item/storage/box/papersack/millionaire_bonus/PopulateContents()
|
||||
new /obj/item/stack/spacecash/c5000(src)
|
||||
new /obj/item/coin/adamantine(src)
|
||||
new /obj/item/food/cookie(src)
|
||||
new /obj/item/food/chocolatebar(src)
|
||||
new /obj/item/pen/fourcolor(src)
|
||||
new /obj/item/reagent_containers/cup/glass/flask(src)
|
||||
new /obj/item/soap/nanotrasen(src)
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
/obj/structure/flora/tree/pine/xmas/millionaire //not really a tree but the code is close enough
|
||||
icon = 'modular_zubbers/icons/obj/fluff/bonus.dmi'
|
||||
icon_state = "bonusnt"
|
||||
pixel_x = 0
|
||||
name = "bonus bag pile"
|
||||
desc = "A pile of bonus bags. Try to find one with your name on it!"
|
||||
var/gift_type = /obj/item/storage/box/papersack/millionaire_bonus
|
||||
var/unlimited = FALSE
|
||||
var/static/list/took_bonus
|
||||
|
||||
/obj/structure/flora/tree/pine/xmas/millionaire/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!took_bonus)
|
||||
took_bonus = list()
|
||||
|
||||
/obj/structure/flora/tree/pine/xmas/millionaire/attack_hand(mob/living/user, list/modifiers)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
if(!user.ckey)
|
||||
return
|
||||
|
||||
if(took_bonus[user.ckey] && !unlimited)
|
||||
to_chat(user, span_warning("You already claimed your bonus!"))
|
||||
return
|
||||
to_chat(user, span_warning("After a bit of rummaging, you locate a bonus bag with your name on it!"))
|
||||
|
||||
if(!unlimited)
|
||||
took_bonus[user.ckey] = TRUE
|
||||
|
||||
var/obj/item/G = new gift_type(src)
|
||||
user.put_in_hands(G)
|
||||
@@ -0,0 +1,20 @@
|
||||
/mob/living/basic/trooper/syndicate/boggins //unique and powerful operative for a special evac shuttle
|
||||
name = "Shipmaster Boggins"
|
||||
desc = "He's the master of the ship. Stay friendly, and nobody gets hurt."
|
||||
faction = list(FACTION_NEUTRAL) //simple hack to make him not attack anyone but will cause hostiles (including other troopers) to attack him but it shouldn't be an issue
|
||||
health = 250
|
||||
maxHealth = 250
|
||||
gender = MALE
|
||||
ai_controller = /datum/ai_controller/basic_controller/trooper
|
||||
melee_damage_lower = 15
|
||||
melee_damage_upper = 25
|
||||
armour_penetration = 15
|
||||
melee_attack_cooldown = 0.70 SECONDS
|
||||
attack_verb_continuous = "brutally strikes"
|
||||
attack_verb_simple = "brutally strike"
|
||||
attack_sound = 'sound/items/weapons/cqchit1.ogg'
|
||||
r_hand = /obj/item/megaphone/sec //I can't figure out how to make this actually work like a megaphone
|
||||
|
||||
/mob/living/basic/trooper/syndicate/boggins/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/simple_access, ACCESS_SYNDICATE)
|
||||
@@ -0,0 +1,9 @@
|
||||
/mob/living/basic/pet/syndifox/mini
|
||||
name = "Syni-Fox"
|
||||
desc = "It's a Cybersun MiniVix robotic model wearing a microsized syndicate MODsuit and a cute little cap. Quite pretty. This one looks a bit more mini."
|
||||
initial_size = 0.8
|
||||
faction = list(FACTION_NEUTRAL)
|
||||
|
||||
/mob/living/basic/pet/syndifox/mini/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/simple_access, ACCESS_SYNDICATE)
|
||||
@@ -0,0 +1,14 @@
|
||||
/obj/item/ammo_box/magazine/beandog
|
||||
name = "shotgun magazine (12g beanbag)"
|
||||
desc = "A custom drum magazine of shotgun shells, suitable only for the Beandog combat shotgun."
|
||||
icon = 'modular_zubbers/icons/obj/weapons/guns/ammo.dmi'
|
||||
icon_state = "m12gbb"
|
||||
base_icon_state = "m12gbb"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
|
||||
caliber = CALIBER_SHOTGUN
|
||||
max_ammo = 8
|
||||
casing_phrasing = "shell"
|
||||
|
||||
/obj/item/ammo_box/magazine/beandog/update_icon_state()
|
||||
. = ..()
|
||||
icon_state = "[base_icon_state]-[CEILING(ammo_count(FALSE)/8, 1)*8]"
|
||||
@@ -0,0 +1,11 @@
|
||||
/obj/item/gun/ballistic/shotgun/bulldog/beanbag
|
||||
name = "\improper Beandog Shotgun"
|
||||
desc = "A 2-round burst fire, mag-fed shotgun for target suppression in narrow corridors, \
|
||||
nicknamed 'Beandog' by internal security. Compatible only with specialized 8-round beanbag slug drum magazines. \
|
||||
Can have a secondary magazine attached to quickly reload."
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/beandog
|
||||
icon = 'modular_zubbers/icons/obj/weapons/guns/ballistic.dmi'
|
||||
icon_state = "beandog"
|
||||
burst_size = 2
|
||||
burst_delay = 2
|
||||
pin = /obj/item/firing_pin
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 706 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.4 KiB |
@@ -9325,6 +9325,7 @@
|
||||
#include "modular_zubbers\code\game\objects\structures\aliens.dm"
|
||||
#include "modular_zubbers\code\game\objects\structures\chalkboard.dm"
|
||||
#include "modular_zubbers\code\game\objects\structures\engine_choice.dm"
|
||||
#include "modular_zubbers\code\game\objects\structures\flora.dm"
|
||||
#include "modular_zubbers\code\game\objects\structures\lewd_portals.dm"
|
||||
#include "modular_zubbers\code\game\objects\structures\mirror.dm"
|
||||
#include "modular_zubbers\code\game\objects\structures\ore_vent.dm"
|
||||
@@ -9826,6 +9827,7 @@
|
||||
#include "modular_zubbers\code\modules\mob\living\basic\space_fauna\dolphin_ai.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\basic\space_fauna\space_dragon\space_dragon.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\basic\trooper\nanotrasen.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\basic\trooper\syndicate.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\basic\vermin\mouse.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\carbon\carbon.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\carbon\examine.dm"
|
||||
@@ -9879,6 +9881,7 @@
|
||||
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\zombie.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\silicon\silicon.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\silicon\robot\robot.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\simple_animal\friendly\syndicatefox.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\simple_animal\guardian\guardian.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\simple_animal\hostile\megafauna\_megafauna.dm"
|
||||
#include "modular_zubbers\code\modules\mob\living\simple_animal\hostile\megafauna\drake.dm"
|
||||
@@ -9963,6 +9966,7 @@
|
||||
#include "modular_zubbers\code\modules\projectiles\ammunition\ballistic\rifle.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\ammunition\ballistic\smg.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\boxes_magazines\external\pistol.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\boxes_magazines\external\shotgun.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\boxes_magazines\external\smg.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\boxes_magazines\internal\revolver.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\boxes_magazines\internal\toy.dm"
|
||||
@@ -9972,6 +9976,7 @@
|
||||
#include "modular_zubbers\code\modules\projectiles\guns\ballistic\pistol.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\guns\ballistic\revolver.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\guns\ballistic\rifle.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\guns\ballistic\shotgun.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\guns\ballistic\toy.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\guns\energy\energyguns.dm"
|
||||
#include "modular_zubbers\code\modules\projectiles\guns\energy\pulse.dm"
|
||||
|
||||
Reference in New Issue
Block a user