Commit Graph

310 Commits

Author SHA1 Message Date
CitadelStationBot 30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788)
* Clean up all sorts of crap, mostly defines

* fixes compile errors
2018-03-05 13:23:28 -06:00
CitadelStationBot 75b038511c [MIRROR] Alternative PR to brass apples: Adds bronze sheets (#5758)
* Alternative PR to brass apples: Adds bronze sheets (#35874)

* Adds bronze sheets

* nope!

* Alternative PR to brass apples: Adds bronze sheets
2018-03-02 20:07:39 -06:00
CitadelStationBot d8faf15832 [MIRROR] Cleans up some spaces (#5593)
* Merge pull request #35811 from ShizCalev/spacing

Cleans up some spaces

* Cleans up some spaces
2018-02-19 10:27:17 -06:00
CitadelStationBot 1d028256d2 [MIRROR] Slippery Ice Fix (#5581)
* Slippery Ice Fix (#35770)

* Makes ice slippery again

* Update misc_plating.dm

* Slippery Ice Fix
2018-02-18 19:52:03 -06:00
kevinz000 da8a12b906 [READY]Fixes hitscan beams going across the station, hitscan projectiles now properly cross zlevels and generate beams. (#35344)
* Cross Z support

* Fixes projectile cross-Z

* removes unnecessary code

* don't draw impacts if you're not impacting

* fix

* unneeded var

* No mapcheck()ing anymore, space does it for us 2.0
2018-02-18 11:34:29 -06:00
deathride58 d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339
[MIRROR] Support stations with multiple z-levels
2018-02-17 21:24:48 +00:00
LetterJay b6ad24b9da Merge pull request #5541 from Citadel-Station-13/upstream-merge-35734
[MIRROR] Cleans up unused /area paths
2018-02-17 09:57:18 -06:00
vuonojenmustaturska 7214836012 Merge pull request #35734 from ShizCalev/path-cleanup
Cleans up unused /area paths
2018-02-17 09:39:20 -06:00
Jordan Brown 48f6e72293 Merge pull request #35716 from AnturK/slipspace
Fixes wet space.
2018-02-17 00:48:18 -06:00
vuonojenmustaturska 5ea2e57419 Merge pull request #35629 from ShizCalev/floor-tool_acts
Converts floor tool interactions to tool_act, fixes flooring exploits
2018-02-16 06:07:19 -06:00
Tad Hardesty 5b30b29a4b Support stations with multiple z-levels (#35339)
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
2018-02-15 10:39:08 -06:00
CitadelStationBot 9b4770f855 [MIRROR] Mining tools now use tool system (#5462)
* Mining tools now use tool system

* Update hydroponics.dm
2018-02-14 05:36:15 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
MoreRobustThanYou 73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
CitadelStationBot 717da969a6 [MIRROR] Var cleanup and map fixes (#5359)
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
BordListian 9b910552fd Forces gases to obey certain laws of nature (#35277)
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.

* - Redundant parenthesis
- I'm going back to sleep

* - Sends fire and fusion to jail

* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors

* - Reverted the tritium burn changes because apparently I'm dumb

* - FUCK

* - Fixes division by zero when fusion has no impurities

* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs

* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
2018-02-07 02:32:31 -06:00
CitadelStationBot 7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
MMMiracles 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
Poojawa fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Jordan Brown 829cf4d180 Merge pull request #34623 from ninjanomnom/template-placeontop
Makes templates able to use PlaceOnTop
2018-01-24 18:18:31 -06:00
KorPhaeron 3ef5dc14b5 Rebee atmos (#34723) 2018-01-21 21:07:28 -06:00
LetterJay d24a9d02d3 Merge pull request #4986 from Citadel-Station-13/upstream-merge-34497
[MIRROR] Adds holy vision (Some mobs can now see blessed tiles)
2018-01-21 11:55:52 -06:00
Dax Dupont 4826dec880 Adds holy vision (Some mobs can now see blessed tiles) (#34497)
* Blessed turfs are visible to people who care about blessed turfs

* A better way

* Adds holy vision

* Compacts special types

* space space space

* Glowing

* Final Solution

* wraith

* bawhoppen has autism and we must hugbox

* Implements feedback
2018-01-21 02:04:47 -06:00
Jordan Brown bb51095b00 Merge pull request #34656 from ShizCalev/makeslippery
Fixes missing MakeSlippery() args
2018-01-20 14:09:49 -06:00
ShizCalev f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
deathride58 9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
kevinz000 ba16e3a100 Fixes lavaboat buckling (#34450)
* Buckle order

* lavaboats
2018-01-16 14:31:02 -06:00
BordListian 1a7341f2c4 Stray bullets and explosions don't blow up the entire syndi lava base anymore (#34401)
* - Changes explosions to save a reference to the epicenter atom
- Changes syndicate bomb cores to have themselves as the epicenter, removing a redundant get_turf call
- Changes explosive plastitanium walls to only be triggered by bomb core explosions. This is a tad cumbersome but there's only 12 of these walls in the game.

* - Removes debug code

* - Can't hurt
2018-01-16 08:36:27 -06:00
Emmett Gaines a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
AnturK 269cbab223 Fixes cables/lattices for lateloaded templates. 2018-01-13 14:51:03 -06:00
deathride58 62cfb99cb7 Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310
[MIRROR] Removes some hrefs from logging
2018-01-12 17:48:13 +00:00
JJRcop ed6ec3d63a Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
Tad Hardesty 72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay 706556df69 Merge pull request #4601 from Citadel-Station-13/upstream-merge-33919
[MIRROR] turfs changed to /space/basic are instead turned into /space
2018-01-02 18:13:42 -06:00
LetterJay dcca57808b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
# Conflicts:
#	code/game/gamemodes/blob/overmind.dm
2018-01-02 14:58:09 -06:00
oranges 18f5e1095a Merge pull request #34035 from ninjanomnom/actually-changeturf
Puts back the changeturf part of PlaceOnTop()
2018-01-02 00:12:32 -06:00
LetterJay 30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay 168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
LetterJay 515092bd1c Merge branch 'master' into upstream-merge-33919 2018-01-01 04:11:29 -06:00
Jordan Brown 4e0efc64d5 Merge pull request #33957 from ninjanomnom/helper-cleanup
cleans up some behaviour for PlaceOnTop/Bottom
2017-12-31 10:01:46 -06:00
LetterJay b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
Jordan Brown cbb8d807f1 turfs changed to /space/basic are instead turned into /space 2017-12-30 13:14:04 -06:00
LetterJay f860fa0cd3 Update closed.dm 2017-12-30 05:12:10 -06:00
LetterJay a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
Tad Hardesty 0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay 0f328e22b2 Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558
[MIRROR] Dead cultists can now cross Reebe's "Servant Blocker"
2017-12-29 06:24:09 -06:00
Robustin a9a94f7aed Dead cultists can now cross Reebe's "Servant Blocker" (#33558)
* Dead Cultist Exception

* Servant blocker update

* Corpse balance

* Lets corpses pass servant blocker

* Lets cult corpses pass servant blocker

* Update servant_blocker.dm

* Update open.dm

* Update servant_blocker.dm

* Update open.dm
2017-12-29 00:29:19 -06:00