Skip to content

Commit ad711d1

Browse files
ConstelladoConstellado
authored
Merge branch 'PentestSS13:master' into master
2 parents 7fc62c1 + 188e875 commit ad711d1

File tree

318 files changed

+28602
-6759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+28602
-6759
lines changed

‎_maps/RandomRuins/BeachRuins/beach_bunkers.dmm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,9 @@
15551555
/mob/living/simple_animal/hostile/human/frontier/ranged/officer/rifle{
15561556
aggro_vision_range = 14
15571557
},
1558-
/obj/effect/landmark/mission_poi/main/kill,
1558+
/obj/effect/landmark/mission_poi/main/kill{
1559+
already_spawned = 1
1560+
},
15591561
/turf/open/floor/concrete/pavement/beachplanet/lit,
15601562
/area/overmap_encounter/planetoid/beachplanet/explored)
15611563
"ug" = (
@@ -1652,7 +1654,6 @@
16521654
pixel_x = 6
16531655
},
16541656
/obj/item/food/deadmouse{
1655-
pixel_y = 0;
16561657
pixel_x = -13
16571658
},
16581659
/turf/open/floor/plating/dirt/beach,

‎_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2737,8 +2737,8 @@
27372737
/obj/item/spacecash/bundle/c1000,
27382738
/obj/item/spacecash/bundle/c1000,
27392739
/obj/item/gun/ballistic/automatic/marksman/vickland,
2740-
/obj/item/ammo_box/vickland_a308/empty,
2741-
/obj/item/ammo_box/vickland_a308/empty,
2740+
/obj/item/ammo_box/vickland_a8_50r/empty,
2741+
/obj/item/ammo_box/vickland_a8_50r/empty,
27422742
/turf/open/floor/wood/mahogany,
27432743
/area/ruin/powered/icemoon/lodge/montagne_office)
27442744
"Oa" = (

‎_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2492,9 +2492,8 @@
24922492
/obj/structure/barricade/security{
24932493
layer = 2.89
24942494
},
2495-
/obj/machinery/porta_turret/ship/syndicate/heavy/starport{
2496-
dir = 10;
2497-
lethal = 1
2495+
/obj/machinery/porta_turret/ruin/ramzi/heavy{
2496+
dir = 10
24982497
},
24992498
/turf/open/floor/concrete/reinforced/jungleplanet/lit,
25002499
/area/ruin/jungle/airbase/turrets)
@@ -3562,9 +3561,8 @@
35623561
/obj/structure/barricade/security{
35633562
layer = 2.89
35643563
},
3565-
/obj/machinery/porta_turret/ship/syndicate/heavy/starport{
3566-
dir = 6;
3567-
lethal = 1
3564+
/obj/machinery/porta_turret/ruin/ramzi/heavy{
3565+
dir = 6
35683566
},
35693567
/turf/open/floor/concrete/reinforced/jungleplanet/lit,
35703568
/area/ruin/jungle/airbase/turrets)
@@ -6803,9 +6801,8 @@
68036801
/obj/structure/barricade/security{
68046802
layer = 2.89
68056803
},
6806-
/obj/machinery/porta_turret/ship/syndicate/heavy/starport{
6807-
dir = 9;
6808-
lethal = 1
6804+
/obj/machinery/porta_turret/ruin/ramzi/heavy{
6805+
dir = 9
68096806
},
68106807
/turf/open/floor/concrete/reinforced/jungleplanet/lit,
68116808
/area/ruin/jungle/airbase/turrets)
@@ -9706,8 +9703,9 @@
97069703
/obj/structure/cable{
97079704
icon_state = "4-8"
97089705
},
9709-
/mob/living/simple_animal/hostile/human/ramzi/ranged/space/stormtrooper/shotgun/incendiary,
9710-
/obj/effect/landmark/mission_poi/main/kill,
9706+
/obj/effect/landmark/mission_poi/main/kill{
9707+
type_to_spawn = /mob/living/simple_animal/hostile/human/ramzi/ranged/space/shotgun/incendiary
9708+
},
97119709
/turf/open/floor/plating/jungleplanet/lit,
97129710
/area/overmap_encounter/planetoid/jungle/explored)
97139711
"Py" = (
@@ -12049,9 +12047,8 @@
1204912047
/obj/structure/barricade/security{
1205012048
layer = 2.89
1205112049
},
12052-
/obj/machinery/porta_turret/ship/syndicate/heavy/starport{
12053-
dir = 5;
12054-
lethal = 1
12050+
/obj/machinery/porta_turret/ruin/ramzi/heavy{
12051+
dir = 5
1205512052
},
1205612053
/turf/open/floor/concrete/reinforced/jungleplanet/lit,
1205712054
/area/ruin/jungle/airbase/turrets)
@@ -17300,7 +17297,7 @@ bY
1730017297
uX
1730117298
uX
1730217299
bp
17303-
kX
17300+
pw
1730417301
BM
1730517302
eO
1730617303
"}

‎_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2662,7 +2662,7 @@
26622662
/mob/living/simple_animal/pet/mothroach{
26632663
name = "Baffles"
26642664
},
2665-
/obj/effect/landmark/mission_poi{
2665+
/obj/effect/landmark/mission_poi/main{
26662666
type_to_spawn = /mob/living/simple_animal/pet/mothroach;
26672667
already_spawned = 1
26682668
},

‎_maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@
5959
/turf/open/floor/carpet/nanoweave/orange,
6060
/area/ruin/whitesands/e11manufactory/office)
6161
"aD" = (
62-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
62+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
63+
faction = list("eoehoma")
64+
},
6365
/obj/structure/fluff/paper/stack,
6466
/obj/structure/fluff/paper/stack{
6567
dir = 1
@@ -349,7 +351,9 @@
349351
/area/overmap_encounter/planetoid/sand/explored)
350352
"ch" = (
351353
/obj/effect/decal/cleanable/dirt/dust,
352-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
354+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
355+
faction = list("eoehoma")
356+
},
353357
/turf/open/floor/concrete/whitesands/lit,
354358
/area/overmap_encounter/planetoid/sand/explored)
355359
"cm" = (
@@ -499,7 +503,9 @@
499503
/obj/structure/chair/office{
500504
dir = 4
501505
},
502-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
506+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
507+
faction = list("eoehoma")
508+
},
503509
/obj/effect/decal/cleanable/dirt,
504510
/turf/open/floor/carpet/nanoweave/beige,
505511
/area/ruin/whitesands/e11manufactory/office)
@@ -881,7 +887,9 @@
881887
/turf/open/floor/concrete/whitesands/lit,
882888
/area/overmap_encounter/planetoid/sand/explored)
883889
"hb" = (
884-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
890+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
891+
faction = list("eoehoma")
892+
},
885893
/obj/effect/decal/cleanable/dirt/dust,
886894
/turf/open/floor/concrete/whitesands/lit,
887895
/area/overmap_encounter/planetoid/sand/explored)
@@ -1099,7 +1107,9 @@
10991107
/obj/structure/sign/poster/official/work_for_a_future{
11001108
pixel_y = 32
11011109
},
1102-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
1110+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
1111+
faction = list("eoehoma")
1112+
},
11031113
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
11041114
dir = 8
11051115
},
@@ -1292,7 +1302,6 @@
12921302
name = "Croquette's bed";
12931303
desc = "A comfy-looking mothroach bed."
12941304
},
1295-
/obj/effect/landmark/mission_poi/main,
12961305
/turf/open/floor/carpet/nanoweave/blue,
12971306
/area/ruin/whitesands/e11manufactory/office)
12981307
"jT" = (
@@ -2128,7 +2137,7 @@
21282137
/obj/structure/filingcabinet{
21292138
dir = 4
21302139
},
2131-
/obj/item/documents/eoehoma,
2140+
/obj/item/folder/documents/eoehoma,
21322141
/obj/item/pen/fourcolor,
21332142
/obj/item/clothing/neck/stethoscope{
21342143
w_class = 2
@@ -2858,7 +2867,9 @@
28582867
/obj/effect/turf_decal/corner/opaque/red/diagonal{
28592868
dir = 4
28602869
},
2861-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
2870+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
2871+
faction = list("eoehoma")
2872+
},
28622873
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
28632874
dir = 4
28642875
},
@@ -4099,7 +4110,9 @@
40994110
/area/overmap_encounter/planetoid/sand/explored)
41004111
"GA" = (
41014112
/obj/effect/turf_decal/corner/opaque/red/diagonal,
4102-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
4113+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
4114+
faction = list("eoehoma")
4115+
},
41034116
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
41044117
/obj/structure/sign/poster/official/bless_this_spess{
41054118
pixel_y = 32
@@ -4846,7 +4859,9 @@
48464859
/turf/open/floor/plasteel/dark,
48474860
/area/ruin/whitesands/e11manufactory/barracks)
48484861
"MC" = (
4849-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
4862+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
4863+
faction = list("eoehoma")
4864+
},
48504865
/obj/machinery/light/small/directional/south,
48514866
/turf/open/floor/plasteel/mono,
48524867
/area/ruin/whitesands/e11manufactory/barracks)
@@ -4887,7 +4902,9 @@
48874902
/turf/closed/wall/rust,
48884903
/area/ruin/whitesands/e11manufactory/security)
48894904
"MY" = (
4890-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
4905+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
4906+
faction = list("eoehoma")
4907+
},
48914908
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
48924909
dir = 4
48934910
},
@@ -5376,7 +5393,9 @@
53765393
/obj/structure/cable/orange{
53775394
icon_state = "4-8"
53785395
},
5379-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
5396+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
5397+
faction = list("eoehoma")
5398+
},
53805399
/turf/open/floor/concrete/whitesands/lit,
53815400
/area/overmap_encounter/planetoid/sand/explored)
53825401
"Qu" = (
@@ -5869,7 +5888,9 @@
58695888
/turf/open/floor/plating/asteroid/whitesands/grass/dead/lit,
58705889
/area/overmap_encounter/planetoid/sand/explored)
58715890
"Ub" = (
5872-
/mob/living/simple_animal/hostile/human/hermit/ranged/e11,
5891+
/mob/living/simple_animal/hostile/human/hermit/ranged/e11{
5892+
faction = list("eoehoma")
5893+
},
58735894
/turf/open/floor/plasteel/mono,
58745895
/area/ruin/whitesands/e11manufactory/warehouse)
58755896
"Ug" = (

0 commit comments

Comments
 (0)