Commit Graph

102 Commits

Author SHA1 Message Date
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
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
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
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
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
KorPhaeron 3ef5dc14b5 Rebee atmos (#34723) 2018-01-21 21:07:28 -06:00
ShizCalev f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
Emmett Gaines a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05: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
Tad Hardesty 0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
Emmett Gaines 9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
Emmett Gaines f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
Jordan Brown 057d05df91 Merge pull request #33484 from vuonojenmustaturska/eminencefix
Fixes glass shard/bananium floor behavior for cameras and ghosts
2017-12-13 09:14:16 -06:00
Jordan Brown e1f658a50d Removes ComponentActivated in favor of callbacks 2017-12-05 15:42:47 -06:00
Tad Hardesty 38c45fb479 Refactor chasm paths to be more sane (#32701)
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.

Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
2017-11-22 03:30:49 -06:00
WJohn e8ddae5d98 Cleans up floors.dmi a bit and adds new turf decals. 2017-11-20 20:48:06 -06:00
Tad Hardesty 6f06e690a4 Fix double progress bars when digging basalt (#32306) 2017-11-02 04:11:07 -05:00
CitadelStationBot d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
ShizCalev 272fcc0b5d Stops plating subtypes from stating it has holes for rods & you can now only build ontop of it with tiles. (#31788)
* Stops plating types from stating rod holes

* More immersion. Stops building ontop with rods.
2017-10-17 13:37:25 -05:00
Leo 0380e43f33 Merge pull request #31698 from duncathan/atmos-patch7
Prevents tiles from being placed on top of buckled mobs
2017-10-15 14:02:02 -05:00
Emmett Gaines 24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
LetterJay 8aebc3b15a Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909
[MIRROR] Radiation rework and subsystem
2017-10-13 23:58:04 -04:00
Emmett Gaines 55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Jordan Brown 9d448fda76 Merge pull request #31602 from AnturK/tunnels
Fixes diagonal tunnels
2017-10-13 09:14:34 -05:00
Jordan Brown 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay 9ee8b6298f Merge pull request #3133 from Citadel-Station-13/upstream-merge-31275
[MIRROR] Adds deconstruction hints to various things
2017-10-04 18:44:50 -04:00
oranges 25cf971fef Merge pull request #31275 from kingofkosmos/moredeconhints
Adds deconstruction hints to various things
2017-10-04 16:33:51 -05:00
kevinz000 1a3fc9f1c6 why plus a minus value and not just minus the value... (#31279)
* Update bullets.dm

* Update visuals_icons.dm

* Update asteroid.dm
2017-10-04 14:03:20 -05:00
LetterJay f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
LetterJay b88081e106 Update misc_floor.dm 2017-09-30 14:19:27 -05:00
Joan Lung e4b4860e44 Reebe is fancier now 2017-09-28 21:59:05 -05:00
Ashe Higgs e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
CitadelStationBot 2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857)
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
2017-09-22 23:35:22 -05:00
CitadelStationBot 69c1d74f65 [MIRROR] Corrects killroom turf gas mixture (#2805)
* Corrects killroom turf gas mixture

* Corrects killroom turf gas mixture
2017-09-17 12:00:59 -05:00
CitadelStationBot 768c90fc03 [MIRROR] Removes vine floors and their sprite (#2807)
* Removes vine floors and their sprite (#30778)

* removes vine floors and their sprite

* Once more, with feeling

* Revert "Merge branch 'kudzufix' of https://github.com/vuonojenmustaturska/tgstation into kudzufix"

This reverts commit 89d99caa75dcadabebdf44a6e4b6c40b2914156a, reversing
changes made to 92e89ed02b767b927a83ee3a878b6eb38f590c5c.

* Removes vine floors and their sprite
2017-09-17 12:00:19 -05:00
CitadelStationBot 4da91bc330 [MIRROR] Fixes Archaeology not working (#2744)
* Fixes Archaeology not working (#30547)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* Fixes Archaeology not working
2017-09-13 16:53:30 -05:00
Joan Lung 2dc3868949 Makes shiny versions of lavaland monsters slightly more distinct (#30502)
* Makes shiny versions of lavaland monsters slightly more distinct

* classic

* lower drop

* tweak drops

* this is kind of absurd
2017-09-11 20:54:55 -05:00
ExcessiveUseOfCobblestone 33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
LetterJay 92e055be97 Quick sync (#2587)
* sync since the mirror was down

* fucking byond

* can't forget these
2017-09-04 04:38:49 -05:00
kevinz000 175224c5de Merge branch 'master' into upstream-merge-29859 2017-08-29 21:14:45 -07:00
kevinz000 b9c58a2914 wew 2017-08-29 21:14:33 -07:00
CitadelStationBot 719717934c Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it 2017-08-29 17:10:59 -05:00