Skip to content

Commit

Permalink
Merge pull request #29 from dwasint/particle_weather
Browse files Browse the repository at this point in the history 
1000 yard stare
  • Loading branch information
@dwasint
dwasint authored Nov 17, 2024
2 parents 85e56d9 + 0a0512b commit a11fef1
Show file tree
Hide file tree
Showing 649 changed files with 1,514 additions and 68,841 deletions.
1 change: 0 additions & 1 deletion _maps/custom/otherz/old/otherz.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@
/turf/closed/mineral/rogue/bedrock,
/area/rogue)
"bD" = (
/obj/item/clothing/head/kitty,
/turf/closed/mineral/random/rogue/high,
/area/rogue/under/cavelava)
"bE" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/custom/otherz/smallforest.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
/turf/open/water/swamp,
/area/rogue/outdoors/woods)
"aQ" = (
/turf/closed/indestructible/riveted/boss,
/turf/closed/wall/mineral/rogue/wood/boss,
/area/rogue/outdoors/woods)
"aR" = (
/mob/living/simple_animal/hostile/retaliate/rogue/mole,
Expand Down
12 changes: 6 additions & 6 deletions _maps/custom/otherz/underworld.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
/turf/open/floor/rogue/underworld/road,
/area/rogue)
"b" = (
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue/underworld)
"c" = (
/obj/effect/landmark/underworldsafe,
/turf/open/floor/rogue/underworld/road,
/area/rogue)
"d" = (
/obj/structure/underworld/barrier,
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue/underworld)
"e" = (
/turf/open/floor/rogue/underworld/road,
Expand Down Expand Up @@ -44,11 +44,11 @@
/turf/open/floor/rogue/churchrough,
/area/rogue/underworld)
"l" = (
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue)
"m" = (
/obj/effect/landmark/underworldsafe,
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue)
"n" = (
/obj/structure/flora/roguetree/underworld,
Expand All @@ -67,11 +67,11 @@
/area/rogue/underworld)
"q" = (
/obj/structure/flora/roguetree/underworld,
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue/underworld)
"r" = (
/obj/effect/landmark/underworldcoin,
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue/underworld)
"s" = (
/obj/effect/landmark/underworldsafe,
Expand Down
11 changes: 5 additions & 6 deletions _maps/custom/roguehamlet.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8041,7 +8041,6 @@
lockid = "mage";
name = "secret projectes"
},
/obj/item/ship_in_a_bottle,
/obj/item/bomb{
pixel_x = 3;
pixel_y = 3
Expand Down Expand Up @@ -12880,10 +12879,10 @@
/obj/structure/closet/crate/chest/old_crate,
/obj/item/reagent_containers/food/snacks/rogue/meat/steak,
/obj/item/reagent_containers/food/snacks/rogue/meat/steak,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/rogue/meat/poultry,
/obj/item/reagent_containers/food/snacks/rogue/meat/poultry,
/obj/item/reagent_containers/food/snacks/rogue/meat/steak,
Expand Down Expand Up @@ -18811,7 +18810,7 @@
/area/rogue/indoors/shelter/town/dwarf)
"tAx" = (
/obj/structure/fluff/nest,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg,
/turf/open/floor/rogue/dirt/road,
/area/rogue/indoors/town)
"tAK" = (
Expand Down
18 changes: 8 additions & 10 deletions _maps/custom/roguehamlet1.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2689,7 +2689,6 @@
/area/rogue/indoors/town/church/chapel)
"dht" = (
/obj/structure/closet/crate/roguecloset/dark,
/obj/item/ship_in_a_bottle,
/obj/item/bomb{
pixel_x = 3;
pixel_y = 3
Expand Down Expand Up @@ -5496,8 +5495,8 @@
},
/obj/item/reagent_containers/food/snacks/rogue/meat/steak,
/obj/item/reagent_containers/food/snacks/rogue/meat/steak,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/rogueweapon/knife/cleaver,
/turf/open/floor/rogue/dirt/road,
/area/rogue/indoors/town)
Expand Down Expand Up @@ -8774,7 +8773,6 @@
ambush_mobs = list(/mob/living/simple_animal/hostile/retaliate/rogue/wolf = 50, /mob/living/carbon/human/species/human/northern/bum/ambush = 30)
})
"jGc" = (
/mob/living/simple_animal/cow,
/turf/open/floor/rogue/dirt,
/area/rogue/outdoors/town)
"jGo" = (
Expand Down Expand Up @@ -12478,12 +12476,12 @@
first_time_text = "Blackwine Manor"
})
"nBX" = (
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg,
/obj/structure/closet/crate/roguecloset/inn/chest,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/turf/open/floor/rogue/blocks,
/area/rogue/under/town/basement)
"nCg" = (
Expand Down Expand Up @@ -18376,7 +18374,7 @@
/area/rogue/indoors/shelter/town/dwarf)
"tAx" = (
/obj/structure/fluff/nest,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg,
/turf/open/floor/rogue/dirt/road,
/area/rogue/indoors/town)
"tAK" = (
Expand Down
4 changes: 0 additions & 4 deletions _maps/map_files/dakkatown/dakkatown.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5710,9 +5710,6 @@
/area/rogue/indoors/town)
"vM" = (
/obj/structure/closet/crate/roguecloset,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit,
/obj/item/clothing/mask/gas/plaguedoctor,
/obj/item/clothing/head/plaguedoctorhat,
/obj/item/roguekey/apothecary,
/turf/open/floor/rogue/ruinedwood/spiral,
/area/rogue/indoors/town/apothecary)
Expand Down Expand Up @@ -11285,7 +11282,6 @@
/turf/closed/wall/mineral/rogue/stone,
/area/rogue/outdoors/town)
"QW" = (
/turf/open/space/basic,
/area/rogue/outdoors/town)
"QX" = (
/turf/open/floor/rogue/church,
Expand Down
1 change: 0 additions & 1 deletion _maps/map_files/debug/multiz.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,6 @@
"dO" = (
/obj/structure/table,
/obj/machinery/light,
/obj/item/twohanded/fireaxe,
/obj/item/extinguisher,
/turf/open/floor/plasteel,
/area/storage/primary)
Expand Down
10 changes: 2 additions & 8 deletions _maps/map_files/dun_manor/dun_manor.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,12 +362,6 @@
/turf/open/floor/rogue/blocks/stonered/tiny,
/area/rogue/indoors/town)
"auw" = (
/obj/item/kitchen/spoon/plastic,
/obj/item/kitchen/spoon/plastic{
pixel_x = -5;
pixel_y = 3
},
/obj/item/kitchen/spoon/plastic,
/obj/structure/rack/rogue/shelf/big{
icon_state = "shelf_biggest";
pixel_y = 0
Expand Down Expand Up @@ -7868,7 +7862,7 @@
/area/rogue/outdoors/rtfield)
"hEt" = (
/obj/item/candle/yellow/lit/infinite{
light_outer_range = 1;
light_outer_range = 1;
pixel_x = -8;
pixel_y = 5
},
Expand Down Expand Up @@ -10598,7 +10592,7 @@
/area/rogue/outdoors/town/roofs)
"ktR" = (
/obj/item/candle/yellow/lit/infinite{
light_outer_range = 1;
light_outer_range = 1;
pixel_x = 8;
pixel_y = 5
},
Expand Down
14 changes: 4 additions & 10 deletions _maps/map_files/generic/CentCom.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1349,10 +1349,6 @@
"eq" = (
/turf/open/floor/rogue/tile/masonic/spiral,
/area/rogue)
"eB" = (
/obj/item/nullrod/claymore/chainsaw_sword,
/turf/closed/wall/mineral/rogue/decostone/cand,
/area/rogue)
"eD" = (
/obj/structure/fluff/railing/wood{
dir = 1
Expand Down Expand Up @@ -2582,7 +2578,7 @@
/area/rogue)
"wB" = (
/obj/effect/landmark/start/new_player,
/turf/open/floor/plating,
/turf/open/floor/rogue/blocks,
/area/start)
"wO" = (
/turf/closed,
Expand Down Expand Up @@ -3008,7 +3004,6 @@
/turf/open/floor/rogue/grass,
/area/rogue/outdoors)
"Dt" = (
/obj/structure/fluff/divine/nexus,
/obj/structure/fluff/wallclock,
/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue)
Expand Down Expand Up @@ -3082,7 +3077,6 @@
/obj/item/roguecoin/gold/pile,
/obj/item/roguecoin/gold/pile,
/obj/item/roguecoin/gold/pile,
/obj/item/bikehorn/golden,
/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue)
"Fl" = (
Expand Down Expand Up @@ -4005,7 +3999,7 @@
/turf/open/floor/rogue/wood,
/area/rogue)
"RX" = (
/turf/closed/indestructible/riveted,
/turf/closed/wall/mineral/rogue/wood,
/area/start)
"Sc" = (
/obj/item/rope/chain,
Expand Down Expand Up @@ -4334,7 +4328,7 @@
/turf/open/floor/rogue/metal/barograte,
/area/rogue/indoors/vampire_manor)
"Vz" = (
/turf/closed/indestructible/splashscreen,
/turf/closed/splashscreen,
/area/start)
"VB" = (
/turf/open/floor/rogue/dirt,
Expand Down Expand Up @@ -11055,7 +11049,7 @@ rQ
rQ
rQ
bX
eB
RP
ke
sZ
HX
Expand Down
1 change: 0 additions & 1 deletion _maps/map_files/roguetown/otherz/old/otherz.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@
/turf/closed/mineral/rogue/bedrock,
/area/rogue)
"bD" = (
/obj/item/clothing/head/kitty,
/turf/closed/mineral/random/rogue/high,
/area/rogue/under/cavelava)
"bE" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/map_files/roguetown/otherz/smalldecap.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,6 @@
/area/rogue/outdoors/mountains/decap)
"Ko" = (
/obj/structure/table/wood/reinforced,
/obj/item/ship_in_a_bottle,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/rogue/concrete,
/area/rogue/outdoors/mountains/decap)
Expand Down
10 changes: 5 additions & 5 deletions _maps/map_files/roguetown/otherz/underworld.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
/turf/open/floor/rogue/underworld/road,
/area/rogue)
"b" = (
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue/underworld)
"c" = (
/obj/effect/landmark/underworldsafe,
/turf/open/floor/rogue/underworld/road,
/area/rogue)
"d" = (
/obj/structure/underworld/barrier,
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue/underworld)
"e" = (
/turf/open/floor/rogue/underworld/road,
Expand Down Expand Up @@ -44,11 +44,11 @@
/turf/open/floor/rogue/churchrough,
/area/rogue/underworld)
"l" = (
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue)
"m" = (
/obj/effect/landmark/underworldsafe,
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue)
"n" = (
/obj/structure/flora/roguetree/underworld,
Expand All @@ -67,7 +67,7 @@
/area/rogue/underworld)
"q" = (
/obj/structure/flora/roguetree/underworld,
/turf/open/floor/plating/dirt/dark,
/turf/open/floor/rogue/dirt,
/area/rogue/underworld)
"s" = (
/obj/effect/landmark/underworldsafe,
Expand Down
5 changes: 2 additions & 3 deletions _maps/map_files/roguetown/roguetown.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2299,7 +2299,7 @@
pixel_y = 2
},
/obj/item/candle/yellow/lit/infinite{
light_outer_range = 1;
light_outer_range = 1;
pixel_x = 14;
pixel_y = 5
},
Expand Down Expand Up @@ -4091,7 +4091,7 @@
/area/rogue/indoors/town/manor)
"eGP" = (
/obj/structure/flora/ausbushes/leafybush,
/obj/structure/flora/bush,
/obj/structure/flora/ausbushes/leafybush,
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/town)
"eHb" = (
Expand Down Expand Up @@ -4759,7 +4759,6 @@
/area/rogue/outdoors/town)
"ftR" = (
/obj/structure/table/wood,
/obj/item/ship_in_a_bottle,
/turf/open/floor/rogue/wood,
/area/rogue/indoors/town/magician)
"fup" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/vanderlin/vanderlin.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10026,9 +10026,9 @@
/area/rogue/outdoors/rtfield)
"ZO" = (
/obj/structure/closet/crate/chest,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/turf/open/floor/rogue/tile,
/area/rogue/under/town/basement)
"ZP" = (
Expand Down
11 changes: 5 additions & 6 deletions _maps/roguehamlet/roguehamlet.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8109,7 +8109,6 @@
lockid = "mage";
name = "secret projectes"
},
/obj/item/ship_in_a_bottle,
/obj/item/bomb{
pixel_x = 3;
pixel_y = 3
Expand Down Expand Up @@ -12952,10 +12951,10 @@
/obj/structure/closet/crate/chest/old_crate,
/obj/item/reagent_containers/food/snacks/rogue/meat/steak,
/obj/item/reagent_containers/food/snacks/rogue/meat/steak,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/rogue/meat/poultry,
/obj/item/reagent_containers/food/snacks/rogue/meat/poultry,
/obj/item/reagent_containers/food/snacks/rogue/meat/steak,
Expand Down Expand Up @@ -18984,7 +18983,7 @@
/area/rogue/indoors/shelter/town/dwarf)
"tAx" = (
/obj/structure/fluff/nest,
/obj/item/reagent_containers/food/snacks/egg/loaded,
/obj/item/reagent_containers/food/snacks/egg,
/turf/open/floor/rogue/dirt/road,
/area/rogue/indoors/town)
"tAK" = (
Expand Down
Loading

0 comments on commit a11fef1

Please sign in to comment.