shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix maps

Browse Source
This commit is contained in:
timothyteakettle
2020-06-16 02:44:11 +01:00
parent 513a4e3d92
commit b59c8c1af6
6 changed files with 63 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/shuttles/hunter_bounty.dmm
+53 -487
View File
@@ -1,490 +1,56 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"b" = (
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/hunter)
"c" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/shuttle/hunter)
"d" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plating,
/area/shuttle/hunter)
"e" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/open/floor/plating/airless,
/area/shuttle/hunter)
"f" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external,
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/shuttle/hunter)
"g" = (
/obj/structure/sign/warning/vacuum/external,
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/hunter)
"h" = (
/turf/open/floor/plating,
/area/shuttle/hunter)
"i" = (
/obj/structure/grille,
/obj/structure/window/plasma/reinforced/plastitanium,
/turf/open/floor/plating,
/area/shuttle/hunter)
"j" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/shuttle/hunter)
"k" = (
/obj/structure/sign/poster/contraband/bountyhunters,
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/hunter)
"l" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/shuttle/hunter)
"m" = (
/obj/structure/chair/office{
dir = 4
},
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"n" = (
/obj/structure/table,
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"o" = (
/obj/structure/chair/office{
dir = 8
},
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"p" = (
/obj/effect/mob_spawn/human/fugitive/bounty/hook,
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"q" = (
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 8
},
/obj/structure/window/reinforced{
dir = 4
},
/turf/open/floor/plating/airless,
/area/shuttle/hunter)
"r" = (
/obj/machinery/computer/launchpad{
dir = 4
},
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"s" = (
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"t" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"u" = (
/obj/structure/curtain/bounty,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"v" = (
/obj/structure/chair/office{
dir = 4
},
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"w" = (
/obj/structure/table,
/obj/item/phone,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"x" = (
/obj/structure/table,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"y" = (
/obj/structure/chair/office{
dir = 8
},
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"z" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"A" = (
/obj/machinery/computer/shuttle/hunter{
icon_state = "computer";
dir = 8
},
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"B" = (
/obj/machinery/launchpad,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"C" = (
/obj/item/multitool,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"D" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"E" = (
/obj/structure/table,
/obj/item/binoculars,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"F" = (
/obj/machinery/power/smes,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"G" = (
/obj/machinery/fugitive_capture,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"H" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"I" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
icon_state = "computer";
dir = 8
},
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"J" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"K" = (
/obj/machinery/suit_storage_unit/standard_unit{
storage_type = /obj/item/tank/internals/oxygen/yellow
},
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"L" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/machinery/door/airlock/external,
/obj/docking_port/stationary{
dwidth = 11;
height = 16;
id = "pirateship_home";
name = "Deep Space";
width = 17
},
/obj/docking_port/mobile{
dheight = 3;
dwidth = 3;
height = 13;
id = "huntership";
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "hunter shuttle";
rechargeTime = 1800;
width = 15
},
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/shuttle/hunter)
"M" = (
/obj/effect/mob_spawn/human/fugitive/bounty/armor{
icon_state = "sleeper";
dir = 1
},
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"P" = (
/obj/structure/fluff/empty_sleeper{
icon_state = "sleeper-open";
dir = 1
},
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"Z" = (
/obj/effect/mob_spawn/human/fugitive/bounty/synth,
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/closed/wall/mineral/plastitanium,/area/shuttle/hunter)
"c" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper,/obj/machinery/door/airlock/external,/turf/open/floor/plating,/area/shuttle/hunter)
"d" = (/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plating,/area/shuttle/hunter)
"e" = (/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/open/floor/plating/airless,/area/shuttle/hunter)
"f" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper,/obj/machinery/door/airlock/external,/obj/structure/fans/tiny,/turf/open/floor/plating,/area/shuttle/hunter)
"g" = (/obj/structure/sign/warning/vacuum/external,/turf/closed/wall/mineral/plastitanium,/area/shuttle/hunter)
"h" = (/turf/open/floor/plating,/area/shuttle/hunter)
"i" = (/obj/structure/grille,/obj/item/stack/tile/mineral/plastitanium,/turf/open/floor/plating,/area/shuttle/hunter)
"j" = (/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating,/area/shuttle/hunter)
"k" = (/obj/structure/sign/poster/contraband/bountyhunters,/turf/closed/wall/mineral/plastitanium,/area/shuttle/hunter)
"l" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external,/turf/open/floor/plating,/area/shuttle/hunter)
"m" = (/obj/structure/chair/office{dir = 4},/turf/open/floor/pod/light,/area/shuttle/hunter)
"n" = (/obj/structure/table,/turf/open/floor/pod/light,/area/shuttle/hunter)
"o" = (/obj/structure/chair/office{dir = 8},/turf/open/floor/pod/light,/area/shuttle/hunter)
"p" = (/obj/effect/mob_spawn/human/fugitive/bounty/hook,/turf/open/floor/pod/light,/area/shuttle/hunter)
"q" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/open/floor/plating/airless,/area/shuttle/hunter)
"r" = (/obj/machinery/computer/launchpad{dir = 4},/turf/open/floor/pod/dark,/area/shuttle/hunter)
"s" = (/turf/open/floor/pod/dark,/area/shuttle/hunter)
"t" = (/obj/effect/turf_decal/stripes/line{dir = 9},/turf/open/floor/pod/dark,/area/shuttle/hunter)
"u" = (/obj/item/circuitboard/computer/bounty,/turf/open/floor/pod/dark,/area/shuttle/hunter)
"v" = (/obj/structure/chair/office{dir = 4},/turf/open/floor/pod/dark,/area/shuttle/hunter)
"w" = (/obj/structure/table,/obj/item/phone,/turf/open/floor/pod/dark,/area/shuttle/hunter)
"x" = (/obj/structure/table,/turf/open/floor/pod/dark,/area/shuttle/hunter)
"y" = (/obj/structure/chair/office{dir = 8},/turf/open/floor/pod/dark,/area/shuttle/hunter)
"z" = (/obj/structure/chair/comfy/shuttle{dir = 4},/turf/open/floor/pod/dark,/area/shuttle/hunter)
"A" = (/obj/machinery/computer/shuttle/hunter{icon_state = "computer"; dir = 8},/turf/open/floor/pod/dark,/area/shuttle/hunter)
"B" = (/obj/machinery/launchpad,/turf/open/floor/pod/dark,/area/shuttle/hunter)
"C" = (/obj/item/multitool,/turf/open/floor/pod/dark,/area/shuttle/hunter)
"D" = (/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/pod/dark,/area/shuttle/hunter)
"F" = (/obj/machinery/power/smes,/turf/open/floor/pod/dark,/area/shuttle/hunter)
"G" = (/obj/machinery/fugitive_capture,/turf/open/floor/pod/dark,/area/shuttle/hunter)
"H" = (/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/pod/dark,/area/shuttle/hunter)
"I" = (/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{icon_state = "computer"; dir = 8},/turf/open/floor/pod/dark,/area/shuttle/hunter)
"J" = (/obj/structure/table,/obj/item/storage/toolbox/mechanical,/turf/open/floor/pod/light,/area/shuttle/hunter)
"K" = (/obj/machinery/suit_storage_unit/standard_unit{storage_type = /obj/item/tank/internals/oxygen/yellow},/turf/open/floor/pod/light,/area/shuttle/hunter)
"L" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external,/obj/docking_port/stationary{dwidth = 11;height = 16;id = "pirateship_home";name = "Deep Space";width = 17},/obj/docking_port/mobile{dheight = 3;dwidth = 3;height = 13;id = "huntership";movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);name = "hunter shuttle";width = 15},/obj/structure/fans/tiny,/turf/open/floor/plating,/area/shuttle/hunter)
"M" = (/obj/effect/mob_spawn/human/fugitive/bounty/armor{icon_state = "sleeper"; dir = 1},/turf/open/floor/pod/light,/area/shuttle/hunter)
"P" = (/obj/structure/fluff/empty_sleeper{icon_state = "sleeper-open"; dir = 1},/turf/open/floor/pod/light,/area/shuttle/hunter)
"Z" = (/obj/effect/mob_spawn/human/fugitive/bounty/synth,/turf/open/floor/pod/light,/area/shuttle/hunter)
(1,1,1) = {"
a
a
a
b
a
a
a
a
a
b
a
a
a
"}
(2,1,1) = {"
a
a
a
b
a
a
a
a
a
b
a
a
a
"}
(3,1,1) = {"
b
a
a
b
a
e
a
e
a
b
a
a
b
"}
(4,1,1) = {"
b
a
e
b
b
q
i
q
b
b
e
a
b
"}
(5,1,1) = {"
b
b
q
b
b
r
B
F
b
b
q
b
b
"}
(6,1,1) = {"
b
b
g
b
b
s
C
G
b
b
g
b
b
"}
(7,1,1) = {"
f
d
h
j
l
t
D
H
c
d
h
j
L
"}
(8,1,1) = {"
b
b
i
b
b
u
u
u
b
b
i
b
b
"}
(9,1,1) = {"
a
b
i
b
m
v
s
s
K
b
i
b
a
"}
(10,1,1) = {"
a
a
i
k
n
w
x
s
K
b
i
a
a
"}
(11,1,1) = {"
a
a
a
b
J
x
E
s
K
b
a
a
a
"}
(12,1,1) = {"
a
a
a
b
o
y
s
s
K
b
a
a
a
"}
(13,1,1) = {"
a
a
a
i
b
u
u
u
b
i
a
a
a
"}
(14,1,1) = {"
a
a
a
i
p
s
s
s
P
i
a
a
a
"}
(15,1,1) = {"
a
a
a
i
Z
z
s
z
M
i
a
a
a
"}
(16,1,1) = {"
a
a
a
b
i
A
n
I
i
b
a
a
a
"}
(17,1,1) = {"
a
a
a
a
i
i
i
i
i
a
a
a
a
aabbbbfbaaaaaaaaa
aaaabbdbbaaaaaaaa
aaaeqghiiiaaaaaaa
bbbbbbjbbkbbiiiba
aaabbblbmnJobpZii
aaeqrstuvwxyuszAi
aaaiBCDusxxsussni
aaeqFGHussssuszIi
aaabbbcbKKKKbPMii
bbbbbbdbbbbbiiiba
aaaeqghiiiaaaaaaa
aaaabbjbbaaaaaaaa
aabbbbLbaaaaaaaaa
"}
_maps/shuttles/hunter_russian.dmm
-1
View File
@@ -203,7 +203,6 @@
id = "huntership";
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "hunter shuttle";
rechargeTime = 1800;
width = 15
},
/turf/open/floor/mineral/plastitanium/red,
_maps/shuttles/hunter_space_cop.dmm
-1
View File
@@ -29,7 +29,6 @@
height = 12;
id = "huntership";
name = "hunter shuttle";
rechargeTime = 1800;
width = 7
},
/obj/machinery/door/poddoor/shutters{
code/game/objects/effects/contraband.dm
+5
View File
@@ -428,6 +428,11 @@
desc = "A poster decipting a snake shaped into an ominous 'S'!"
icon_state = "poster47"
/obj/structure/sign/poster/contraband/bountyhunters
name = "Bounty Hunters"
desc = "A poster advertising bounty hunting services. \"I hear you got a problem.\""
icon_state = "poster48"
/obj/structure/sign/poster/official
poster_item_name = "motivational poster"
poster_item_desc = "An official Nanotrasen-issued poster to foster a compliant and obedient workforce. It comes with state-of-the-art adhesive backing, for easy pinning to any vertical surface."
code/modules/events/fugitive_spawning.dm
+1 -1
View File
@@ -57,7 +57,7 @@
//after spawning
playsound(src, 'sound/weapons/emitter.ogg', 50, TRUE)
new /obj/item/storage/toolbox/mechanical(landing_turf) //so they can actually escape maint
addtimer(CALLBACK(src, .proc/spawn_hunters), 10 MINUTES)
addtimer(CALLBACK(src, .proc/spawn_hunters), 1 MINUTES)
role_name = "fugitive hunter"
return SUCCESSFUL_SPAWN
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+4 -4
View File
@@ -496,11 +496,11 @@
/obj/item/udder
name = "udder"
/obj/item/udder/Initialize(loc, /datum/reagent/reagent)
if(!reagent)
reagent = /datum/reagent/consumable/milk
/obj/item/udder/Initialize(loc, milk_reagent)
if(!milk_reagent)
milk_reagent = /datum/reagent/consumable/milk
create_reagents(50, NONE, NO_REAGENTS_VALUE)
reagents.add_reagent(reagent, 20)
reagents.add_reagent(milk_reagent, 20)
. = ..()
/obj/item/udder/proc/generateMilk(datum/reagent/milk_reagent)