Commit Graph

409 Commits

Author SHA1 Message Date
kevinz000 4650e4d353 Merge pull request #8557 from Ghommie/Ghommie-cit34
Ports the fix for that stupid z-level edge pull breaking bug.
2019-06-08 01:26:17 -07:00
kevinz000 aca85123be Merge pull request #8555 from Ghommie/Ghommie-cit32
Updates radials, makes RCD and RCL use em.
2019-06-08 01:25:37 -07:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie f8903a871e Another episode of "fixing that stupid map edge bug again". 2019-06-07 04:55:05 +02:00
Ghommie 5a69499927 Hol up, unrelated PR time, atomization. 2019-06-07 01:32:15 +02:00
Ghommie e6e06a1a43 Makes clockwork wall - sonic jackhammer interaction account the wall's superheating. 2019-06-02 13:59:36 +02:00
deathride58 4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
Nero1024 2a4a656a4d Port new footsteps from tg 2019-05-17 18:10:03 -05:00
deathride58 41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58 2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58 8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
kevinz000 7628289ad6 Merge pull request #8091 from deathride58/fixesz1hyperspace
Fixes centcom zlevel hyperspace acting like normal space (and also fixes the title screen while im at it)
2019-03-10 13:43:21 -07:00
kevinz000 0652c32c23 Merge pull request #8058 from deathride58/joggingslipresistance
Makes jogging let you avoid water slips, but only if you have less than 20% staminaloss
2019-03-10 13:43:05 -07:00
deathride58 df1decf1b1 Merge pull request #8087 from Trilbyspaceclone/QoL-RCD
[MIRROR]  fixes some edge cases in rcd building #42960 TG code
2019-03-08 20:46:19 -05:00
deathride58 64ab4a32a3 Fixes centcom zlevel hyperspace not instantly teleporting mobs out of the z-level (and also fixes the title screen while im at it) 2019-03-04 21:38:34 -05:00
Trilbyspaceclone 518bce82c0 Update plating.dm 2019-03-04 16:34:37 -05:00
deathride58 7ece5aa1c3 Water will no longer slip jogging spaceman, but only if the jogging spaceman has less than 20% staminaloss 2019-02-27 08:16:54 -05:00
deathride58 ed23ce28ee Opts for the realistic route of making non-border transit turfs simply use normal space turf physics 2019-02-23 02:43:18 -05:00
deathride58 624671bca4 makes things thrown out of shuttles carry the proper physical momentum when exiting transit areas 2019-02-21 01:45:26 -05:00
deathride58 5d9e3e0092 realistic transit turfs - transit turfs will now physically throw you out of the transit area instead of simply teleporting you 2019-02-21 01:38:18 -05:00
kevinz000 eada20a1d9 Update closed.dm 2019-01-05 23:14:29 -08:00
deathride58 9ee2d94ab2 Merge pull request #7831 from Citadel-Station-13/ball_stuff
[No this is not just for testmerge]Adds the required assets for the ball map
2019-01-03 08:00:03 -05:00
kevinz000 5f0462b604 Update river.dm 2018-12-20 01:00:36 -08:00
kevinz000 1034a6ad0e ball stuff 2018-12-16 03:41:37 -08:00
nik707 cae30f90ad Merge pull request #7799 from R3dtail/new_carpet
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
2018-12-10 16:45:38 -06:00
Redtail 629189fdc1 Added Another new carpet, and two tables, and a new cargo crate.
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
2018-12-07 22:48:46 -06:00
deathride58 b230f1a1ea Fixes wavedashing 2018-12-05 19:49:14 -05:00
Redtail e339bcd2ca Added a new carpet
Worked on adding a new carpet.  It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
2018-12-01 20:21:18 -06:00
deathride58 81cb475b2c atomizes some of the med rework's stamina tweaks - you can now scramble on the ground while in hard stamcrit, and the more staminaloss you take while in stamcrit decreases the amount of staminaloss you'll take for the entirety of your time in stamcrit (#7689) 2018-10-30 19:32:03 -07:00
deathride58 0ce450eab8 tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory 2018-10-02 19:36:21 -04:00
Poojawa 720b25c6f5 floor fixes and gun memes 2018-09-22 03:50:37 -05:00
Poojawa d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa 1a2460ed28 Continous update intergration until being merged
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
Poojawa 42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBot 06d08c67c3 [MIRROR] Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#7327)
* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#38852)

* a commit message

* reviews addressed?

* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated
2018-07-04 18:38:53 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan Brown a14bc0615d Merge pull request #38644 from AutomaticFrenzy/patch/cameranet
Port AI static to vis_contents
2018-06-25 20:23:32 -05:00
LetterJay 78265ad51b Merge pull request #7144 from Citadel-Station-13/upstream-merge-38524
[MIRROR] Fix some of the Lavaland roundstart atmos active turfs
2018-06-18 10:10:49 -05:00
LetterJay a97514965a Merge pull request #7124 from Citadel-Station-13/upstream-merge-38486
[MIRROR] Removes an unused open turf var
2018-06-18 09:50:35 -05:00
Tad Hardesty 27b80045ad Fix some of the Lavaland roundstart atmos active turfs (#38524) 2018-06-17 03:15:08 -05:00
LetterJay 351f43a392 Merge pull request #7113 from Citadel-Station-13/upstream-merge-38500
[MIRROR] Fixes attacking wooden walls
2018-06-16 16:17:28 -05:00
Emmett Gaines 3e8168890f Removes an unused open turf var (#38486) 2018-06-16 06:19:37 -05:00
Emmett Gaines 1f3bbebe0a Moves arch component application to where archdrops is defined (#38487) 2018-06-16 06:17:48 -05:00
AnturK 460bcd399d Fixes attacking wooden walls (#38500) 2018-06-16 06:17:10 -05:00
CitadelStationBot d875c362fa [MIRROR] Turf grammar omnibus (#7104)
* Turf grammar omnibus (#38375)

* Fix plurality and propriety on turfs

Some turfs are marked tentatively plural in order to avoid an incorrect
choice of "a" or "an".

* Add an article var to handle unusual a/an

* An additional pass on turf names

* Decapitalize server, mainframe, killroom floors

* Turf grammar omnibus
2018-06-13 19:31:29 -07:00
deathride58 e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00