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
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
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
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
518bce82c0
Update plating.dm
2019-03-04 16:34:37 -05:00
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
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
624671bca4
makes things thrown out of shuttles carry the proper physical momentum when exiting transit areas
2019-02-21 01:45:26 -05:00
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
eada20a1d9
Update closed.dm
2019-01-05 23:14:29 -08:00
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
5f0462b604
Update river.dm
2018-12-20 01:00:36 -08:00
1034a6ad0e
ball stuff
2018-12-16 03:41:37 -08:00
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
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
b230f1a1ea
Fixes wavedashing
2018-12-05 19:49:14 -05:00
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
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
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
720b25c6f5
floor fixes and gun memes
2018-09-22 03:50:37 -05:00
d231018a3a
Flashy flash and Gondola Pods
...
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
bc0d14c193
Continual updates until merged
2018-09-17 04:55:03 -05:00
1a2460ed28
Continous update intergration until being merged
...
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
42db44b39e
Alien Ruin fix, various cherrypicked upstream fixes
...
Also adds new buildmode
2018-09-13 22:55:11 -05:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
ac6fddcfb3
Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync
2018-07-05 00:17:44 -04:00
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
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
a14bc0615d
Merge pull request #38644 from AutomaticFrenzy/patch/cameranet
...
Port AI static to vis_contents
2018-06-25 20:23:32 -05:00
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
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
27b80045ad
Fix some of the Lavaland roundstart atmos active turfs ( #38524 )
2018-06-17 03:15:08 -05:00
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
3e8168890f
Removes an unused open turf var ( #38486 )
2018-06-16 06:19:37 -05:00
1f3bbebe0a
Moves arch component application to where archdrops is defined ( #38487 )
2018-06-16 06:17:48 -05:00
460bcd399d
Fixes attacking wooden walls ( #38500 )
2018-06-16 06:17:10 -05:00
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
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
9124dac65f
Adds indestructible sandstone wall ( #38350 )
...
* adds sandstone
* OKAY FINE KOR
JEEZ
* I am very angry right now
* you don't seem to understand
* Update closed.dm
2018-06-07 23:16:17 -05:00
bd6fb5f9e5
New directional beach sprites and corners for the 2018 Summer Ball ( #38262 )
...
* Adds beach corners, interior corners, and other sides in addition to the normal down direction.
* SOMEONE LIED TO ME
* Update misc_plating.dm
* don't copy paste at 4am
* okay there we go
2018-06-04 00:47:45 -05:00
3f85ba3724
Merge pull request #6976 from Citadel-Station-13/upstream-merge-38210
...
[MIRROR] Fix reagents being lost when vomit piles combine
2018-06-02 07:31:53 -05:00
6060af1c49
Merge pull request #38210 from AutomaticFrenzy/patch/by-vomit-combined
...
Fix reagents being lost when vomit piles combine
2018-06-01 09:58:50 -05:00
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
4452dc4629
Corrects bronze floor & table's name ( #38164 )
2018-05-31 22:41:01 -05:00
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
06b7cdf27a
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
63aa6eeee6
Update lava.dm
2018-05-22 07:58:44 -05:00
359d31238d
Merge branch 'master' into upstream-merge-37486
2018-05-21 11:59:57 -05:00
931a950adb
Merge branch 'master' into upstream-merge-37486
2018-05-21 08:59:32 -05:00
kevinz000