Skip to content

Commit

Permalink
here we go again (#2456)
Browse files Browse the repository at this point in the history
  • Loading branch information
@LetterJay @silicons
LetterJay authored and silicons committed Aug 25, 2017
1 parent c7ed043 commit 188193e
Show file tree
Hide file tree
Showing 1,107 changed files with 25,425 additions and 25,422 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ It is rarely allowed to put type paths in a text format, as there are no compile

```DM
//Good
var/path_type = /obj/item/weapon/baseball_bat
var/path_type = /obj/item/baseball_bat
//Bad
var/path_type = "/obj/item/weapon/baseball_bat"
var/path_type = "/obj/item/baseball_bat"
```

### Tabs, not spaces
Expand Down
46 changes: 23 additions & 23 deletions _maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/area/ruin/powered/beach)
"ae" = (
/obj/structure/table,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/item/storage/toolbox/mechanical,
/obj/item/stack/cable_coil,
/turf/open/floor/plating,
/area/ruin/powered/beach)
Expand Down Expand Up @@ -86,7 +86,7 @@
/turf/open/floor/plating,
/area/ruin/powered/beach)
"at" = (
/obj/item/weapon/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
/turf/open/floor/plating,
/area/ruin/powered/beach)
"au" = (
Expand All @@ -112,7 +112,7 @@
/area/ruin/powered/beach)
"az" = (
/obj/item/clothing/neck/necklace/dope,
/obj/item/weapon/reagent_containers/spray/spraytan,
/obj/item/reagent_containers/spray/spraytan,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"aA" = (
Expand All @@ -130,10 +130,10 @@
/area/ruin/powered/beach)
"aD" = (
/obj/structure/table,
/obj/item/weapon/storage/box/drinkingglasses,
/obj/item/weapon/storage/box/drinkingglasses,
/obj/item/weapon/reagent_containers/food/drinks/shaker,
/obj/item/weapon/storage/box/beakers,
/obj/item/storage/box/drinkingglasses,
/obj/item/storage/box/drinkingglasses,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/storage/box/beakers,
/obj/machinery/light{
dir = 1
},
Expand All @@ -153,13 +153,13 @@
/area/ruin/powered/beach)
"aG" = (
/obj/structure/table,
/obj/item/weapon/book/manual/barman_recipes,
/obj/item/weapon/reagent_containers/glass/rag,
/obj/item/book/manual/barman_recipes,
/obj/item/reagent_containers/glass/rag,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"aH" = (
/obj/structure/table,
/obj/item/weapon/storage/box/donkpockets,
/obj/item/storage/box/donkpockets,
/obj/machinery/light{
dir = 1
},
Expand All @@ -172,7 +172,7 @@
/area/ruin/powered/beach)
"aJ" = (
/obj/structure/closet/crate/bin,
/obj/item/weapon/tank/internals/emergency_oxygen,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/trash/candy,
/obj/item/toy/talking/owl,
/obj/effect/turf_decal/stripes/asteroid/line{
Expand Down Expand Up @@ -212,7 +212,7 @@
/area/ruin/powered/beach)
"aR" = (
/obj/structure/table/wood,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila,
/obj/item/reagent_containers/food/drinks/bottle/tequila,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"aS" = (
Expand All @@ -230,7 +230,7 @@
"aV" = (
/obj/effect/mob_spawn/human/beach/alive{
flavour_text = "You're, like, totally a dudebro, bruh. Ch'yea. You came here, like, on spring break, hopin' to pick up some bangin' hot chicks, y'knaw?";
l_pocket = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/dank;
l_pocket = /obj/item/reagent_containers/food/snacks/pizzaslice/dank;
uniform = /obj/item/clothing/under/pants/youngfolksjeans
},
/turf/open/floor/plating/beach/sand,
Expand Down Expand Up @@ -287,7 +287,7 @@
/area/ruin/powered/beach)
"bk" = (
/obj/structure/table/wood,
/obj/item/weapon/reagent_containers/food/snacks/pastatomato,
/obj/item/reagent_containers/food/snacks/pastatomato,
/turf/open/floor/plasteel/asteroid,
/area/ruin/powered/beach)
"bl" = (
Expand All @@ -311,10 +311,10 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/item/weapon/bikehorn/airhorn,
/obj/item/bikehorn/airhorn,
/obj/structure/table/wood,
/obj/item/weapon/storage/firstaid,
/obj/item/weapon/storage/firstaid/brute,
/obj/item/storage/firstaid,
/obj/item/storage/firstaid/brute,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"bB" = (
Expand All @@ -329,7 +329,7 @@
/turf/open/floor/wood,
/area/ruin/powered/beach)
"bE" = (
/obj/item/weapon/reagent_containers/spray/spraytan,
/obj/item/reagent_containers/spray/spraytan,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bF" = (
Expand All @@ -350,7 +350,7 @@
},
/obj/effect/mob_spawn/human/beach/alive{
flavour_text = "You're a spunky lifeguard! It's up to you to make sure nobody drowns or gets eaten by sharks and stuff.";
id = /obj/item/weapon/card/id;
id = /obj/item/card/id;
id_access = "Medical Doctor";
id_job = "Lifeguard";
mob_gender = "female"
Expand All @@ -362,7 +362,7 @@
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bK" = (
/obj/item/weapon/storage/backpack/duffelbag,
/obj/item/storage/backpack/duffelbag,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bL" = (
Expand All @@ -386,7 +386,7 @@
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bP" = (
/obj/item/weapon/reagent_containers/food/drinks/beer,
/obj/item/reagent_containers/food/drinks/beer,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bQ" = (
Expand Down Expand Up @@ -465,8 +465,8 @@
/area/ruin/powered/beach)
"cR" = (
/obj/structure/table/wood,
/obj/item/weapon/tank/internals/oxygen,
/obj/item/weapon/pickaxe,
/obj/item/tank/internals/oxygen,
/obj/item/pickaxe,
/obj/item/clothing/mask/gas,
/turf/open/floor/pod/dark,
/area/ruin/powered/beach)
Expand Down
50 changes: 25 additions & 25 deletions _maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
icon_state = "pipe-c";
invisibility = 101
},
/obj/item/weapon/bikehorn,
/obj/item/bikehorn,
/turf/open/indestructible{
icon_state = "darkyellowfull";
wet = 5
Expand Down Expand Up @@ -254,7 +254,7 @@
},
/area/ruin/powered/clownplanet)
"aO" = (
/obj/item/weapon/bikehorn,
/obj/item/bikehorn,
/obj/structure/disposalpipe/segment{
dir = 4;
invisibility = 101
Expand Down Expand Up @@ -307,7 +307,7 @@
},
/area/ruin/powered/clownplanet)
"aW" = (
/obj/item/weapon/bikehorn,
/obj/item/bikehorn,
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
invisibility = 101
Expand All @@ -327,7 +327,7 @@
/turf/open/floor/plating,
/area/ruin/powered/clownplanet)
"aY" = (
/obj/item/weapon/bikehorn,
/obj/item/bikehorn,
/obj/structure/disposalpipe/segment{
invisibility = 101
},
Expand Down Expand Up @@ -379,10 +379,10 @@
invisibility = 101
},
/obj/structure/table,
/obj/item/weapon/paper/crumpled/bloody{
/obj/item/paper/crumpled/bloody{
info = "If you dare not continue down this path of madness, escape can be found through the chute in this room. "
},
/obj/item/weapon/pen/fourcolor,
/obj/item/pen/fourcolor,
/turf/open/indestructible{
icon_state = "white"
},
Expand Down Expand Up @@ -415,7 +415,7 @@
dir = 4;
invisibility = 101
},
/obj/item/weapon/pickaxe,
/obj/item/pickaxe,
/turf/open/indestructible{
icon_state = "white"
},
Expand Down Expand Up @@ -490,7 +490,7 @@
/turf/closed/mineral/clown,
/area/ruin/powered/clownplanet)
"bq" = (
/obj/item/weapon/pickaxe,
/obj/item/pickaxe,
/turf/open/indestructible{
icon_state = "white"
},
Expand Down Expand Up @@ -519,7 +519,7 @@
/turf/open/floor/plating,
/area/ruin/powered/clownplanet)
"bu" = (
/obj/item/weapon/bikehorn,
/obj/item/bikehorn,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c";
Expand Down Expand Up @@ -646,7 +646,7 @@
},
/area/ruin/powered/clownplanet)
"bL" = (
/obj/item/weapon/reagent_containers/food/drinks/trophy/gold_cup,
/obj/item/reagent_containers/food/drinks/trophy/gold_cup,
/obj/structure/table/glass,
/turf/open/floor/carpet,
/area/ruin/powered/clownplanet)
Expand Down Expand Up @@ -675,7 +675,7 @@
/area/ruin/powered/clownplanet)
"bQ" = (
/obj/structure/table/glass,
/obj/item/weapon/grown/bananapeel/bluespace,
/obj/item/grown/bananapeel/bluespace,
/turf/open/floor/carpet,
/area/ruin/powered/clownplanet)
"bR" = (
Expand All @@ -684,10 +684,10 @@
/turf/open/floor/carpet,
/area/ruin/powered/clownplanet)
"bS" = (
/obj/item/weapon/coin/clown,
/obj/item/weapon/coin/clown,
/obj/item/weapon/coin/clown,
/obj/item/weapon/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/machinery/light/small{
dir = 8
},
Expand All @@ -699,16 +699,16 @@
/turf/open/floor/carpet,
/area/ruin/powered/clownplanet)
"bU" = (
/obj/item/weapon/bikehorn/airhorn,
/obj/item/bikehorn/airhorn,
/turf/open/floor/carpet,
/area/ruin/powered/clownplanet)
"bV" = (
/obj/structure/table/glass,
/obj/item/weapon/gun/magic/staff/honk,
/obj/item/gun/magic/staff/honk,
/turf/open/floor/carpet,
/area/ruin/powered/clownplanet)
"bW" = (
/obj/item/weapon/bikehorn,
/obj/item/bikehorn,
/turf/open/indestructible/sound{
icon_state = "bananium";
name = "bananium floor";
Expand Down Expand Up @@ -736,7 +736,7 @@
},
/area/ruin/powered/clownplanet)
"ca" = (
/obj/item/weapon/bikehorn,
/obj/item/bikehorn,
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/sound{
icon_state = "bananium";
Expand Down Expand Up @@ -865,10 +865,10 @@
/turf/open/floor/carpet,
/area/ruin/powered/clownplanet)
"dL" = (
/obj/item/weapon/coin/clown,
/obj/item/weapon/coin/clown,
/obj/item/weapon/coin/clown,
/obj/item/weapon/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/machinery/light/small{
dir = 4
},
Expand Down Expand Up @@ -926,7 +926,7 @@
/turf/open/lava/smooth,
/area/ruin/powered/clownplanet)
"CB" = (
/obj/item/weapon/paper/crumpled/bloody{
/obj/item/paper/crumpled/bloody{
info = "Abandon hope, all ye who enter here."
},
/obj/effect/decal/cleanable/blood/old,
Expand All @@ -935,7 +935,7 @@
},
/area/lavaland/surface/outdoors/explored)
"KX" = (
/obj/item/weapon/grown/bananapeel{
/obj/item/grown/bananapeel{
color = "#2F3000";
name = "stealth banana peel"
},
Expand Down
Loading

0 comments on commit 188193e

Please sign in to comment.