Skip to content

Commit

Permalink
Maps and misc
Browse files Browse the repository at this point in the history
  • Loading branch information
Poojawa committed Jan 31, 2018
1 parent 67ac5ab commit 56232d5
Show file tree
Hide file tree
Showing 28 changed files with 68,870 additions and 365 deletions.
21 changes: 11 additions & 10 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

/code/__DEFINES/clockcult.dm @ChangelingRain
/code/datums/antagonists/datum_clockcult.dm @ChangelingRain
/code/game/gamemodes/blob/* @ChangelingRain
/code/game/gamemodes/clock_cult/* @ChangelingRain
/code/game/gamemodes/miniantags/revenant* @ChangelingRain
/code/game/objects/effects/temporary_visuals/* @ChangelingRain
/code/game/gamemodes/blob/ @ChangelingRain
/code/game/gamemodes/clock_cult/ @ChangelingRain
/code/game/gamemodes/miniantags/revenant/ @ChangelingRain
/code/game/objects/effects/temporary_visuals/ @ChangelingRain
/code/modules/reagents/chemistry/reagents/blob_reagents.dm @ChangelingRain

# Cyberboss
Expand All @@ -24,14 +24,14 @@
/code/controllers/subsystem/mapping.dm @Cyberboss
/code/controllers/globals.dm @Cyberboss
/code/datums/helper_datums/getrev.dm @Cyberboss
/code/datums/components/* @Cyberboss
/code/datums/components/ @Cyberboss
/code/datums/map_config.dm @Cyberboss
/code/datums/forced_movement.dm @Cyberboss
/code/datums/holocall.dm @Cyberboss
/code/modules/admin/verbs/adminhelp.dm @Cyberboss
/code/modules/admin/verbs/adminpm.dm @Cyberboss
/code/modules/server_tools/* @Cyberboss
/code/modules/mapping/* @Cyberboss
/code/modules/server_tools/ @Cyberboss
/code/modules/mapping/ @Cyberboss

# duncathan

Expand All @@ -40,9 +40,9 @@

# Jordie0608

/SQL/* @Jordie0608
/SQL/ @Jordie0608
/code/controllers/subsystem/dbcore.dm @Jordie0608
/tools/SQLAlertEmail/* @Jordie0608
/tools/SQLAlertEmail/ @Jordie0608

# MrStonedOne

Expand All @@ -57,9 +57,10 @@
# ninjanomnom

/code/controllers/subsystem/shuttle.dm @ninjanomnom
/code/modules/shuttle/* @ninjanomnom
/code/modules/shuttle/ @ninjanomnom

# ShizCalev

/_maps/ @ShizCalev
/sound/ @ShizCalev

Expand Down
18 changes: 12 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -314,15 +314,15 @@ var/list/bag_of_items = list(sword, apple, coinpouch, sword, sword)
var/obj/item/sword/best_sword
for(var/obj/item/sword/S in bag_of_items)
if(!best_sword || S.damage > best_sword.damage)
best_sword = S
best_sword = S
```
The above is a simple proc for checking all swords in a container and returning the one with the highest damage, and it uses DM's standard syntax for a for-loop by specifying a type in the variable of the for's header that DM interprets as a type to filter by. It performs this filter using ```istype()``` (or some internal-magic similar to ```istype()``` - this is BYOND, after all). This is fine in its current state for ```bag_of_items```, but if ```bag_of_items``` contained ONLY swords, or only SUBTYPES of swords, then the above is inefficient. For example:
```DM
var/list/bag_of_swords = list(sword, sword, sword, sword)
var/obj/item/sword/best_sword
for(var/obj/item/sword/S in bag_of_swords)
if(!best_sword || S.damage > best_sword.damage)
best_sword = S
best_sword = S
```
specifies a type for DM to filter by.

Expand All @@ -334,7 +334,7 @@ var/obj/item/sword/best_sword
for(var/s in bag_of_swords)
var/obj/item/sword/S = s
if(!best_sword || S.damage > best_sword.damage)
best_sword = S
best_sword = S
```
Of course, if the list contains data of a mixed type then the above optimisation is DANGEROUS, as it will blindly typecast all data in the list as the specified type, even if it isn't really that type, causing runtime errors.

Expand All @@ -355,9 +355,9 @@ DM has a var keyword, called global. This var keyword is for vars inside of type

```DM
mob
var
global
thing = TRUE
var
global
thing = TRUE
```
This does NOT mean that you can access it everywhere like a global var. Instead, it means that that var will only exist once for all instances of its type, in this case that var will only exist once for all mobs - it's shared across everything in its type. (Much more like the keyword `static` in other languages like PHP/C++/C#/Java)

Expand All @@ -381,6 +381,12 @@ There is no strict process when it comes to merging pull requests. Pull requests

* Please explain why you are submitting the pull request, and how you think your change will be beneficial to the game. Failure to do so will be grounds for rejecting the PR.

## Porting features/sprites/sounds/tools from other codebases

If you are porting features/tools from other codebases, you must give them credit where it's due. Typically, crediting them in your pull request and the changelog is the recommended way of doing it. Take note of what license they use though, porting stuff from AGPLv3 and GPLv3 codebases are allowed.

Regarding sprites & sounds, you must credit the artist and possibly the codebase. All /tg/station assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) license unless otherwise indicated. However if you are porting assets from GoonStation or usually any assets under the [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0/) license are to go into the 'goon' folder of the /tg/station codebase.

## Banned content
Do not add any of the following in a Pull Request or risk getting the PR closed:
* National Socialist Party of Germany content, National Socialist Party of Germany related content, or National Socialist Party of Germany references
Expand Down
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[Directions]: # (If you discovered this issue from playing tgstation hosted servers
[Round ID]: # (If you discovered this issue from playing tgstation hosted servers:)
[Round ID]: # (**INCLUDE THE ROUND ID**)
[Round ID]: # (It can be found in the Status panel or retrieved from https://atlantaned.space/statbus/round.php ! The round id let's us look up valuable information and logs for the round the bug happened.)

[Testmerges]: # (If you believe the issue to be caused by a test merge [OOC tab -> Show Server Revision], report it in the pull request's comment section instead.)

INCLUDE THE ROUND ID
[Reproduction]: # (Explain your issue in detail, including the steps to reproduce it. Issues without proper reproduction steps or explanation are open to being ignored/closed by maintainers.)


from the Status panel or retrieve it from https://atlantaned.space/statbus/round.php ! If you believe the issue to be caused by a test merge [OOC tab -> Show Server Revision], report it in the pull request's comment section instead. Explain your issue in detail, including the steps to reproduce it.)

[For Admins]: # (Oddities induced by var-edits and other admin tools are not necessarily bugs. Verify that your issues occur under regular circumstances before reporting them.)
[For Admins]: # (Oddities induced by var-edits and other admin tools are not necessarily bugs. Verify that your issues occur under regular circumstances before reporting them.)
10 changes: 6 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[Changelogs]: # (Please make a changelog if you're adding, removing or changing content that'll affect players. This includes, but is not limited to, new features, sprites, sounds; balance changes; map edits and important fixes. An example changelog has been provided below for you to edit or remove. If you need help, read https://github.com/tgstation/tgstation/wiki/Changelogs)

[Changelogs]: # (Your PR should contain a detailed changelog of notable changes, titled and categorized appropriately. This includes, new features, sprites, sounds, balance changes, admin tools, map edits, removals, big refactors, config changes, hosting changes and important fixes. An example changelog has been provided below for you to edit. If you need additional help, read https://github.com/tgstation/tgstation/wiki/Changelogs)

:cl: optional name here
add: Added new things
Expand All @@ -8,13 +7,16 @@ del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
wip: added a few works in progress
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
experiment: added an experimental thingy
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

[why]: # (Please add a short description [two lines down] of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding.)
Original file line number Diff line number Diff line change
Expand Up @@ -2597,6 +2597,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
Expand All @@ -2606,6 +2607,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
Expand Down Expand Up @@ -2711,13 +2713,15 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/lavaland/surface/outdoors)
"iv" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
Expand Down Expand Up @@ -3097,6 +3101,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
Expand Down Expand Up @@ -3161,6 +3166,7 @@
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/main)
"jk" = (
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
Expand Down Expand Up @@ -4331,13 +4337,15 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/lavaland/surface/outdoors)
"lw" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
Expand Down
3 changes: 3 additions & 0 deletions _maps/RandomRuins/SpaceRuins/caravanambush.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1825,6 +1825,9 @@
/obj/item/folder/yellow{
pixel_x = -6
},
/obj/item/device/gps{
gpstag = "Distress Signal"
},
/turf/open/floor/plasteel/darkblue/side{
dir = 6;
initial_gas_mix = "TEMP=2.7"
Expand Down
Loading

0 comments on commit 56232d5

Please sign in to comment.