Commit Graph

66914 Commits

Author SHA1 Message Date
spookydonut
4e8ff18b07 Fix Travis grep script to use PCRE to actually match things (#47065)
Several of the greps were missing the `-P` switch which caused them to 
fail to match things. The EOL grep also wasn't working right so I 
replaced it with the one I added to TGMC.
2019-10-19 10:21:05 -07:00
tgstation-server
9aac0ab34e Automatic changelog generation for PR #47176 [ci skip] 2019-10-19 00:24:32 -07:00
Rob Bailey
b9e931f908 Fix stray zero in crayon UI (#47176)
Thank you skoglol for informing me of a stray 0 in the crayon ui
2019-10-19 00:24:28 -07:00
Emmett Gaines
766b935fef Add compile compatibility with 513, upgrade Travis (#47137)
This does all the code changes to allow 513 testing, once this all 
seems about correct it should be merged even if the servers aren't 
using 513.

All changes will be made in a backwards compatible way so that this 
whole process should be harmless.
2019-10-18 23:37:03 -07:00
tgstation-server
03275208b0 Automatic changelog generation for PR #47159 [ci skip] 2019-10-18 23:25:11 -07:00
81Denton
d254bdeca1 Fix yet another Centcom shuttle exploit (#47159)
Remember the last time someone used the supply shuttle to get to 
CentCom and empty the ERT armory? I'm sure glad people aren't doing 
that all the time.
2019-10-18 23:25:08 -07:00
tgstation-server
499d9b3a7d Automatic changelog generation for PR #46921 [ci skip] 2019-10-18 17:11:31 -07:00
Fikou
d61384ce84 adds bronze windows and airlocks (#46921)
* bronze windows

* awoo

* badoom

* bronze airlock

* awoo

* nice

* oof
2019-10-18 20:11:27 -04:00
tgstation-server
17a224c9ca Automatic changelog generation for PR #47174 [ci skip] 2019-10-18 17:07:06 -07:00
81Denton
08c808b252 Merge pull request #47174 from Fox-McCloud/fix-rnd-exploit
Fixes R&D Materials Exploit
2019-10-19 02:07:03 +02:00
tgstation-server
8edcb6614d Automatic changelog generation for PR #47061 [ci skip] 2019-10-18 17:01:30 -07:00
carshalash
437e055b56 Updates Margarita recipe (For real this time) and various alcohol value adjustments (#47061)
* Update drinkingglass.dm

* Update drinks_recipes.dm

* Update alcohol_reagents.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinks_recipes.dm
2019-10-18 20:01:27 -04:00
tgstation-server
4296357b3f Automatic changelog generation for PR #46913 [ci skip] 2019-10-18 16:59:39 -07:00
Qustinnus
b021210a2f [READY] Adds a basic skill framework to Physiology. (Only applied to mining) (#46913)
* levels

* mining

* ore exp

* fixes

* epic

* Update code/game/turfs/simulated/minerals.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* fixes message

* dumb

* shreet

* epic

* fix

* ass

* scrape

* fixes bugs

* fixes

* reset

* test

* ??

* ok bye

* fix

* Adds skills

* skill
2019-10-18 19:59:35 -04:00
tgstation-server
91c5494382 Automatic changelog generation for PR #46986 [ci skip] 2019-10-18 16:49:26 -07:00
moo
940606a239 Adds new bioluminescent traits and mutations (#46986)
* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.

* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.

* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.
2019-10-18 19:49:24 -04:00
tgstation-server
4f61f257c5 Automatic changelog generation for PR #46959 [ci skip] 2019-10-18 16:46:16 -07:00
Yaki
46d57ae96a Skeletons Can No Longer Be Hugged By Facehuggers: Take 2 (#46959)
* creates the xeno immunity trait for skeletons

* creates globalvar for xeno immmunity

* gives skeletons the xeno immunity trait

* makes the hugger check for xeno immunity

* checks for xeno immunity trait over embryo and hivenode

* adds the xeno immunity trait with hivenode

* adds xeno immunity trait when impregnated

* whoops fixed the number of macro args

* okay NOW it should be fixed

* there now it should b gucci
2019-10-18 19:46:13 -04:00
81Denton
6e4996e6e3 Merge pull request #47157 from Time-Green/plunger-masks
Adds plunger unicorns
2019-10-19 01:24:02 +02:00
tgstation-server
0d3643b5d1 Automatic changelog generation for PR #47172 [ci skip] 2019-10-18 16:21:42 -07:00
81Denton
1449ac73ec Merge pull request #47172 from Twaticus/plumbing-mapedit
Metastation plumbing/maint edits
2019-10-19 01:21:38 +02:00
tgstation-server
7a8f457420 Automatic changelog generation for PR #47145 [ci skip] 2019-10-18 16:18:19 -07:00
81Denton
0fe3e12cde Merge pull request #47145 from zxaber/gas_bypass
Renames the pump in front of the SM door from "Gas to Filter" to "Engine Coolant Bypass"
2019-10-19 01:18:15 +02:00
81Denton
e8e1c2b315 Improves signal_fill_type of the storage component. (#47132)
* Fixes forceMove to null

* Checks if the tick has stopped.
2019-10-19 01:17:00 +02:00
nemvar
b7cb636842 Fixes timer for lava warning (#47130) 2019-10-19 01:16:39 +02:00
tgstation-server
d2af394fc6 Automatic changelog generation for PR #47112 [ci skip] 2019-10-18 16:15:21 -07:00
nemvar
159d2ec79d Allows proper application of arguments to components via dropdown (#47112) 2019-10-19 01:15:18 +02:00
tgstation-server
3ff391e430 Automatic changelog compile, [ci skip] 2019-10-18 22:52:43 +00:00
tgstation-server
b3412e627e Automatic changelog generation for PR #46947 [ci skip] 2019-10-18 14:12:58 -07:00
skoglol
e2303d5b85 Reworks coin press (TGUI) (#46947)
* tgui

* use_amount return

* cleanup

* Not my fault

* tgui-next interface done

* undoes changes to tgui.js

* Better UI, prod build.

* uhhh extra file from merge.

* and one more
2019-10-18 23:12:55 +02:00
tgstation-server
5305934052 Automatic changelog compile, [ci skip] 2019-10-18 19:09:03 +00:00
tgstation-server
223b8aaba7 Automatic changelog generation for PR #47192 [ci skip] 2019-10-18 12:04:08 -07:00
Emmett Gaines
1e99190bbe Sets hud in ui screen objects (#47192) 2019-10-18 15:04:04 -04:00
tgstation-server
50402addce Automatic changelog generation for PR #47123 [ci skip] 2019-10-18 10:22:21 -07:00
Rob Bailey
0e1f1ca9a5 TGUI-next static data (#47123)
* static data backend


old tgui compatibility


no more state inlining


better comment


general > data


data > static_data


reference implementation


frontend implementation?


working version

functional manual updating


fix buy privately not triggering ui updates

manual update

rebuild conflict resolution

* Do not read inlined state, adjust object merging priority
2019-10-18 19:22:18 +02:00
Qustinnus
472dd167ac fixes orm not giving mats and rods not having mats (#47163)
* o ok

* ok
2019-10-18 19:19:59 +02:00
nianjiilical
d5416a6c1b Merge remote-tracking branch 'origin/bioluminescence' into bioluminescence 2019-10-18 03:50:12 -03:00
nianjiilical
6677fdc358 Merge remote-tracking branch 'origin/bioluminescence' into bioluminescence 2019-10-18 03:49:48 -03:00
tgstation-server
e5b25fbb13 Automatic changelog compile, [ci skip] 2019-10-18 05:54:11 +00:00
tgstation-server
648eed8d60 Automatic changelog generation for PR #47149 [ci skip] 2019-10-17 22:46:14 -07:00
Rob Bailey
6ce6760b02 [s] Fixes an href exploit related to shuttle docking (#47149)
* no docking

* no fun allowed
2019-10-18 07:46:10 +02:00
Fox McCloud
a8223c2ba3 Better Slime and Xenobiology Equipment Garbage Collection (#46961) 2019-10-17 19:01:48 -07:00
Fox McCloud
e134589681 Fixes R&D Materials Exploit 2019-10-17 21:33:47 -04:00
tgstation-server
47353f40e3 Automatic changelog generation for PR #46975 [ci skip] 2019-10-17 18:30:53 -07:00
Graham
8eab1b8600 Inhand Sprite: Flamethrower lit animation/sound/light (#46975)
* emitter has wrenched state when created

* resync with master

* adds smokey animation to lit flamethrower

* More frames, less busy

* Fixed offset error for lefthand

* adds acti/deactivate sound for flamethrower

* offset fix

* adds ambient light when flamethrower switched on

* OFFSET BLARGH
2019-10-17 18:30:50 -07:00
tgstation-server
bc1a1da18c Automatic changelog generation for PR #47074 [ci skip] 2019-10-17 18:29:25 -07:00
Archanial
06122e1fbe Actually adding camera to surgery B (#47074) 2019-10-17 18:29:22 -07:00
tgstation-server
eb82efbe78 Automatic changelog generation for PR #47125 [ci skip] 2019-10-17 18:28:40 -07:00
nemvar
d9cc619843 unepic mistake (#47125) 2019-10-17 18:28:36 -07:00
Shaps
f5b603aae7 first use of the word plasmeme in the codebase (#47114) 2019-10-17 18:26:53 -07:00