Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makes the Game Fun Again #19

Closed
wants to merge 22 commits into from
Closed

Makes the Game Fun Again #19

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b0087cf
FalloutFalcon ruined this codebase
Yobrocharlie Jul 23, 2024
19219b0
So this is why we were getting so few ruins huh?
Yobrocharlie Jul 23, 2024
3d00d74
Revert "Legion corpse rework (#2543)"
Yobrocharlie Jul 23, 2024
ce4da2f
Adds a few more ships
Yobrocharlie Jul 23, 2024
19f9328
nah you tarded
Yobrocharlie Jul 23, 2024
fec0f51
Update shiptest.dme
Yobrocharlie Jul 23, 2024
e6cff89
smol fix
Yobrocharlie Jul 23, 2024
b8c528f
Revert "smol fix"
Yobrocharlie Jul 23, 2024
8b0437d
test hopefully this works
Yobrocharlie Jul 23, 2024
fa861bd
Update code/game/area/areas/ruins/lavaland.dm
Yobrocharlie Jul 23, 2024
8a69f79
Update code/game/area/areas/ruins/lavaland.dm
Yobrocharlie Jul 23, 2024
e6c7c6d
Update code/game/area/areas/ruins/lavaland.dm
Yobrocharlie Jul 23, 2024
6cbfd8b
Update CentCom.dmm
Yobrocharlie Jul 23, 2024
04531a9
Update lavaland_surface_fuckedupandevilclub.dmm
Yobrocharlie Jul 23, 2024
a9d10ae
Update jungle_demon.dmm
Yobrocharlie Jul 23, 2024
22e11b0
fixes shtruff
Yobrocharlie Jul 23, 2024
dbd2358
fixes nemo and halftrack
Yobrocharlie Jul 23, 2024
d816014
fixes rube goldberg
Yobrocharlie Jul 23, 2024
c1fa752
fixes
Yobrocharlie Jul 23, 2024
3904f6a
fixes a pirate
Yobrocharlie Jul 23, 2024
6025264
Update syndicate_gec_lugol.dmm
Yobrocharlie Jul 23, 2024
eac6b01
lets see if this fixes things
Yobrocharlie Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,545 changes: 1,545 additions & 0 deletions _maps/RandomRuins/BeachRuins/beach_colony.dmm
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 39 additions & 14 deletions _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
/obj/machinery/light/floor,
/obj/machinery/porta_turret/syndicate/energy{
active_power_usage = 0;
faction = list("Frontiersmen","beach");
faction = list("beach","pirate");
idle_power_usage = 0;
reqpower = 0;
name = "Point defense anti-carp turret"
Expand Down Expand Up @@ -485,6 +485,9 @@
/obj/machinery/light/small/directional/north{
light_color = "#694c12"
},
/obj/structure/safe/floor,
/obj/item/book/granter/martial/carp,
/obj/item/grenade/clusterbuster/spawner_spesscarp,
/turf/open/floor/carpet,
/area/ruin/beach)
"tj" = (
Expand Down Expand Up @@ -664,8 +667,8 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"Bg" = (
/obj/effect/turf_decal/corner/opaque/pink/diagonal,
/mob/living/simple_animal/hostile/human/frontier{
faction = list("Frontiersmen","beach")
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/plastic,
/area/ruin/beach)
Expand Down Expand Up @@ -723,7 +726,8 @@
"Ch" = (
/obj/effect/turf_decal/corner/opaque/pink/diagonal,
/obj/structure/sink/kitchen{
dir = 4
dir = 4;
pixel_x = -11
},
/turf/open/floor/plastic,
/area/ruin/beach)
Expand Down Expand Up @@ -823,6 +827,23 @@
/area/ruin/beach)
"Gt" = (
/obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
/mob/living/simple_animal/hostile/human/cat_butcherer{
atmos_requirements = list("min_oxy"=0,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=0,"min_n2"=0,"max_n2"=0);
desc = "A profession carp butcher, gone mad due to carptoxin exposure. There seems to be something in their pocket...";
faction = list("beach","pirate");
health = 300;
loot = list(/obj/effect/mob_spawn/human/corpse/cat_butcher,/obj/item/guardiancreator/carp);
maxHealth = 300;
maxbodytemp = 10000;
melee_damage_lower = 20;
melee_damage_upper = 25;
minbodytemp = 0;
name = "The Butcher";
ranged_cooldown_time = 15;
ranged_message = "fires the speargun at";
real_name = "The Butcher";
unique_name = 1
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 1
},
Expand All @@ -832,8 +853,8 @@
"GP" = (
/obj/structure/chair/sofa/brown/right/directional/south,
/obj/effect/decal/cleanable/cobweb,
/mob/living/simple_animal/hostile/human/frontier{
faction = list("Frontiersmen","beach")
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/carpet,
/area/ruin/beach)
Expand Down Expand Up @@ -1024,8 +1045,8 @@
/obj/structure/chair/plastic{
dir = 8
},
/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered{
faction = list("Frontiersmen","beach")
/mob/living/simple_animal/hostile/human/pirate/ranged{
faction = list("beach","pirate")
},
/turf/open/floor/wood/ebony,
/area/overmap_encounter/planetoid/beachplanet/explored)
Expand Down Expand Up @@ -1098,6 +1119,10 @@
dir = 8
},
/obj/structure/table/wood,
/obj/item/grenade/spawnergrenade/spesscarp{
pixel_x = 3;
pixel_y = -21
},
/obj/item/stack/medical/bruise_pack/herb{
pixel_x = -5;
name = "herbal pack"
Expand All @@ -1110,8 +1135,8 @@
/area/ruin/beach)
"Rh" = (
/obj/structure/chair/sofa/brown/corner/directional/south,
/mob/living/simple_animal/hostile/human/frontier{
faction = list("Frontiersmen","beach")
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/carpet,
/area/ruin/beach)
Expand Down Expand Up @@ -1225,8 +1250,8 @@
pixel_x = 4;
layer = 2.9
},
/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered{
faction = list("Frontiersmen","beach")
/mob/living/simple_animal/hostile/human/pirate/ranged{
faction = list("beach","pirate")
},
/turf/open/floor/wood/ebony,
/area/overmap_encounter/planetoid/beachplanet/explored)
Expand Down Expand Up @@ -1308,8 +1333,8 @@
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"ZJ" = (
/mob/living/simple_animal/hostile/human/frontier{
faction = list("Frontiersmen","beach")
/mob/living/simple_animal/hostile/human/pirate/melee{
faction = list("beach","pirate")
},
/turf/open/floor/wood,
/area/ruin/beach)
Expand Down
Loading
Loading