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

Jump to bottom

kills enrico pucci (the maintainer) #739

Merged
merged 3 commits into from Jul 23, 2022
Merged

kills enrico pucci (the maintainer) #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3a7069
TGU
JohnFulpWillard Jul 18, 2022
6c5ce70
runs updatepaths
JohnFulpWillard Jul 18, 2022
c36a340
fulp map fixes
JohnFulpWillard Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .github/workflows/autowiki.yml
View file
Open in desktop
Expand Up @@ -3,6 +3,9 @@ on:
schedule:
- cron: "5 4 * * *"
workflow_dispatch:
permissions:
contents: read

jobs:
autowiki:
runs-on: ubuntu-latest
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/generate_documentation.yml
View file
Open in desktop
Expand Up @@ -3,8 +3,13 @@ on:
push:
branches:
- master
permissions:
contents: read

jobs:
generate_documentation:
permissions:
contents: write # for JamesIves/github-pages-deploy-action to push changes in repo
if: "!contains(github.event.head_commit.message, '[ci skip]')"
runs-on: ubuntu-20.04
concurrency: gen-docs
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/stale.yml
View file
Open in desktop
Expand Up @@ -4,9 +4,15 @@ on:
schedule:
- cron: "0 0 * * *"

permissions:
contents: read

jobs:
stale:

permissions:
issues: write # for actions/stale to close stale issues
pull-requests: write # for actions/stale to close stale PRs
runs-on: ubuntu-20.04

steps:
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
/area/icemoon/surface)
"h" = (
/obj/effect/mob_spawn/corpse/human/skeleton,
/obj/item/clothing/suit/bronze,
/obj/item/clothing/suit/costume/bronze,
/obj/item/clothing/shoes/bronze,
/obj/item/clothing/head/bronze,
/turf/open/floor/bronze{
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm
View file
Open in desktop
Expand Up @@ -129,9 +129,7 @@
/turf/open/floor/plastic,
/area/ruin/bughabitat)
"of" = (
/obj/structure/sink{
dir = 4
},
/obj/structure/sink/directional/east,
/obj/effect/turf_decal/siding/wideplating/light{
color = "#236F26";
dir = 8
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@
/turf/closed/mineral/random/snow,
/area/icemoon/surface/outdoors/nospawn)
"j" = (
/obj/structure/sink/kitchen,
/obj/structure/sink/kitchen/directional/south,
/turf/open/floor/wood,
/area/ruin/unpowered)
"k" = (
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm
View file
Open in desktop
Expand Up @@ -754,10 +754,7 @@
/turf/open/floor/iron/cafeteria,
/area/ruin/pizzeria/kitchen)
"Aa" = (
/obj/structure/sink{
dir = 4;
pixel_x = -12
},
/obj/structure/sink/directional/east,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden,
/obj/structure/mirror/directional/west,
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm
View file
Open in desktop
Expand Up @@ -22,9 +22,7 @@
/obj/structure/table/bronze{
color = "#666666"
},
/obj/structure/sink/kitchen{
pixel_y = 24
},
/obj/structure/sink/kitchen/directional/south,
/obj/item/plate,
/turf/open/floor/wood/large{
initial_gas_mix = "ICEMOON_ATMOS"
Expand Down
23 changes: 5 additions & 18 deletions _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
View file
Open in desktop
Expand Up @@ -767,10 +767,7 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/underground/explored)
"lc" = (
/obj/structure/sink{
dir = 4;
pixel_x = -12
},
/obj/structure/sink/directional/east,
/obj/structure/mirror/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/blacklight/directional/south,
Expand Down Expand Up @@ -1884,9 +1881,7 @@
/area/icemoon/underground/explored)
"EZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sink{
pixel_y = 20
},
/obj/structure/sink/directional/south,
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop/advanced,
/turf/open/floor/plating/icemoon,
Expand Down Expand Up @@ -1947,9 +1942,7 @@
/obj/item/soap/homemade{
pixel_y = 2
},
/obj/machinery/shower{
dir = 1
},
/obj/machinery/shower/directional/north,
/obj/structure/curtain,
/turf/open/floor/iron/freezer,
/area/ruin/plasma_facility/commons)
Expand Down Expand Up @@ -2809,10 +2802,7 @@
/area/ruin/plasma_facility/commons)
"TD" = (
/obj/structure/table/reinforced,
/obj/structure/sink/kitchen{
dir = 8;
pixel_x = 11
},
/obj/structure/sink/kitchen/directional/west,
/obj/item/reagent_containers/food/condiment/rice{
pixel_x = -6;
pixel_y = 11
Expand Down Expand Up @@ -3021,10 +3011,7 @@
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/commons)
"XU" = (
/obj/structure/sink{
dir = 4;
pixel_x = -12
},
/obj/structure/sink/directional/east,
/obj/structure/mirror/directional/west,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
View file
Open in desktop
Expand Up @@ -209,10 +209,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"sY" = (
/obj/structure/sink/kitchen{
dir = 4;
pixel_x = -12
},
/obj/structure/sink/kitchen/directional/east,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/checker,
/area/ruin/powered)
Expand Down
7 changes: 2 additions & 5 deletions _maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
View file
Open in desktop
Expand Up @@ -18,14 +18,11 @@
/area/ruin/powered/bathhouse)
"e" = (
/obj/structure/mirror/directional/north,
/obj/structure/sink{
pixel_y = 20
},
/obj/structure/sink/directional/south,
/turf/open/floor/iron/white,
/area/ruin/powered/bathhouse)
"f" = (
/obj/machinery/shower{
pixel_y = 16;
/obj/machinery/shower/directional/south{
reagent_id = /datum/reagent/water/holywater
},
/obj/structure/curtain,
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
View file
Open in desktop
Expand Up @@ -148,9 +148,7 @@
/turf/open/floor/plating/icemoon,
/area/ruin/powered/shuttle)
"wJ" = (
/obj/structure/sink{
pixel_y = 20
},
/obj/structure/sink/directional/south,
/turf/open/floor/iron/showroomfloor{
initial_gas_mix = "ICEMOON_ATMOS"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@
/turf/closed/wall/mineral/wood,
/area/ruin/powered/shuttle)
"oJ" = (
/obj/structure/sink,
/obj/structure/sink/directional/south,
/turf/open/floor/plating,
/area/ruin/powered/shuttle)
"pI" = (
Expand Down
24 changes: 8 additions & 16 deletions _maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
View file
Open in desktop
Expand Up @@ -195,9 +195,7 @@
/turf/open/misc/beach/sand,
/area/ruin/powered/beach)
"ek" = (
/obj/machinery/shower{
dir = 8
},
/obj/machinery/shower/directional/west,
/turf/open/floor/iron/white,
/area/ruin/powered/beach)
"et" = (
Expand Down Expand Up @@ -484,9 +482,7 @@
/area/ruin/powered/beach)
"qc" = (
/obj/structure/mirror/directional/west,
/obj/structure/sink/kitchen{
pixel_y = 32
},
/obj/structure/sink/kitchen/directional/south,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
Expand Down Expand Up @@ -584,7 +580,7 @@
},
/obj/item/clothing/neck/beads,
/obj/item/clothing/glasses/sunglasses/reagent,
/obj/item/clothing/suit/hawaiian,
/obj/item/clothing/suit/costume/hawaiian,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"sV" = (
Expand Down Expand Up @@ -926,11 +922,9 @@
/turf/closed/wall/mineral/sandstone,
/area/ruin/powered/beach)
"FC" = (
/obj/structure/sink/kitchen{
/obj/structure/sink/kitchen/directional/west{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
dir = 8;
name = "old sink";
pixel_x = 12
name = "old sink"
},
/turf/open/floor/wood,
/area/ruin/powered/beach)
Expand Down Expand Up @@ -1212,11 +1206,9 @@
/turf/open/floor/sepia,
/area/ruin/powered/beach)
"PY" = (
/obj/structure/sink/kitchen{
/obj/structure/sink/kitchen/directional/east{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
dir = 4;
name = "old sink";
pixel_x = -12
name = "old sink"
},
/turf/open/floor/pod/light,
/area/ruin/powered/beach)
Expand Down Expand Up @@ -1265,7 +1257,7 @@
/obj/structure/closet/cabinet,
/obj/item/storage/backpack/duffelbag,
/obj/item/clothing/under/shorts/blue,
/obj/item/clothing/suit/ianshirt,
/obj/item/clothing/suit/costume/ianshirt,
/obj/item/clothing/shoes/sandal{
desc = "A very fashionable pair of flip-flops.";
name = "flip-flops"
Expand Down
8 changes: 2 additions & 6 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
View file
Open in desktop
Expand Up @@ -3,9 +3,7 @@
/turf/template_noop,
/area/template_noop)
"ab" = (
/obj/machinery/shower{
pixel_y = 12
},
/obj/machinery/shower/directional/south,
/turf/open/floor/iron/white/textured_large,
/area/ruin/powered/snow_biodome)
"ac" = (
Expand Down Expand Up @@ -37,9 +35,7 @@
/turf/open/floor/circuit,
/area/ruin/powered/snow_biodome)
"ai" = (
/obj/structure/sink{
pixel_y = 26
},
/obj/structure/sink/directional/south,
/obj/structure/mirror/directional/east,
/turf/open/floor/iron/white/textured_large,
/area/ruin/powered/snow_biodome)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
View file
Open in desktop
Expand Up @@ -117,7 +117,7 @@
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/clothing/head/fedora/curator,
/obj/item/clothing/suit/curator,
/obj/item/clothing/suit/jacket/curator,
/turf/open/floor/mineral/titanium/white,
/area/ruin/powered/graveyard_shuttle)
"cm" = (
Expand Down
26 changes: 6 additions & 20 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
View file
Open in desktop
Expand Up @@ -184,19 +184,12 @@
/turf/open/floor/vault,
/area/ruin/powered/seedvault)
"aC" = (
/obj/structure/sink{
dir = 4;
pixel_x = -12;
pixel_y = 2
},
/obj/structure/sink/directional/east,
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
/area/ruin/powered/seedvault)
"aD" = (
/obj/structure/sink{
dir = 8;
pixel_x = 11
},
/obj/structure/sink/directional/west,
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
/area/ruin/powered/seedvault)
Expand All @@ -209,7 +202,7 @@
/obj/item/honey_frame,
/obj/item/queen_bee/bought,
/obj/item/clothing/head/beekeeper_head,
/obj/item/clothing/suit/beekeeper_suit,
/obj/item/clothing/suit/utility/beekeeper_suit,
/obj/machinery/light/directional/west,
/turf/open/floor/vault,
/area/ruin/powered/seedvault)
Expand Down Expand Up @@ -246,10 +239,7 @@
/turf/open/floor/iron/dark,
/area/ruin/powered/seedvault)
"aK" = (
/obj/structure/sink{
dir = 8;
pixel_x = 11
},
/obj/structure/sink/directional/west,
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
/area/ruin/powered/seedvault)
Expand Down Expand Up @@ -352,7 +342,7 @@
/obj/item/honey_frame,
/obj/item/queen_bee/bought,
/obj/item/clothing/head/beekeeper_head,
/obj/item/clothing/suit/beekeeper_suit,
/obj/item/clothing/suit/utility/beekeeper_suit,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/vault,
/area/ruin/powered/seedvault)
Expand All @@ -364,11 +354,7 @@
/turf/open/floor/vault,
/area/ruin/powered/seedvault)
"aZ" = (
/obj/structure/sink{
dir = 4;
pixel_x = -12;
pixel_y = 2
},
/obj/structure/sink/directional/east,
/obj/machinery/light/directional/north,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/iron/dark,
Expand Down