Commit Graph

48829 Commits

Author SHA1 Message Date
nemvar fb7c09e81a Neck Slice no longer divides by zero. (#47188)
* No more division by 0

* unepic spelling error
2019-10-19 22:34:12 -04:00
Tony 2f8ef2f725 fixes not being able to access medical first aid kits inside a bag (#47155) 2019-10-19 21:42:17 -04:00
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
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
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
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
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
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
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
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
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
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
nemvar 159d2ec79d Allows proper application of arguments to components via dropdown (#47112) 2019-10-19 01:15:18 +02: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
Emmett Gaines 1e99190bbe Sets hud in ui screen objects (#47192) 2019-10-18 15:04:04 -04: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 6677fdc358 Merge remote-tracking branch 'origin/bioluminescence' into bioluminescence 2019-10-18 03:49:48 -03: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
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
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
kingofkosmos 01d0013809 Health analyzer font scaling hotfix (#47095)
Also rounds the damage numbers.
2019-10-17 18:24:13 -07:00
Emmett Gaines 8982f509b5 Refactors screen object update_icon to call parent (#47094)
* Refactors screen object update_icon to call parent

And makes update_icon an /atom proc

* Cleans up some missed null checks

The student teaches the master
2019-10-17 18:21:50 -07:00
Emmett Gaines 9405c840c6 Makes the hide action_button not clear the overlays every time (#47091) 2019-10-17 18:17:28 -07:00
Emmett Gaines 52022824a5 Makes tk grab not clear every overlay (#47115)
and improves the destroy proc
2019-10-17 18:12:54 -07:00
nemvar c62bfc5616 Travis warning begone (#47165)
* Travis begone

* Fixes other part of this
2019-10-17 20:41:10 -04:00
WarlockD 84f2055e2a Geiger counter will display the correct contamination values now. (#47032)
* Radioactive contamination stays on object if less than 9

When the process dies and the radiation contamination tick is less than 9, it will kill the radiation process but maintain the contamination level.  The geiger counter will then count up all the values and still maintain a high contamination total even though you aren't getting hurt by it.

* Update code/datums/components/radioactive.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-10-17 20:31:00 -04:00
Shadowflame909 62e140007b Zombie-Powder is now a drink from shakespeare: Stress tested edition (#46931)
* The Final Countdown

This time it's a bittersweet drink that'll knock you right out and a delayed shot to make you go sleepy time

* This is starting to look like druggy alcohol

Added slurring. Bumped up cycles till fake death by 3.

Obvious hard-stun tell at 5. Goes away extremely fast if you don't have enough ZP to KO with. As it's just stamina damage.

* Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm

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

* Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-10-17 18:52:47 -04:00
nemvar a20c1d9439 Fixes surgery runtime and renames surgery_helpers.dm (#47128)
* Fixes surgery runtime and renames surgery_helpers.dm

* Update code/modules/surgery/surgery_helpers.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-10-17 18:50:37 -04:00
AnturK 823c09b01e Fixes list vv with numeric values (#47120) 2019-10-17 11:49:09 -04:00
spookydonut cca969feea change these away from defines (#47105) 2019-10-17 10:10:51 -04:00
Time-Green 57993f9a7c thanks vscode, very cool! 2019-10-17 13:55:18 +02:00
Time-Green 53457de5aa adds plunger unicorns 2019-10-17 13:44:50 +02:00
nemvar 1c257a6302 fixes sand recipes (#47113) 2019-10-17 11:04:32 +02:00
Firecage 8dad3bf7f5 Leather crafting menu can be used again. (#47103) 2019-10-17 11:03:08 +02:00
TheChosenEvilOne 8605ae2142 Multi-Z improvements part 2 (#47097)
* MultiZ Improvements

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* RCD works on openspace now.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* I knew something like this would happen with rebasing.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Copy-Paste is gone!

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-10-17 11:02:40 +02:00
oranges 76efd23072 Merge pull request #47146 from ninjanomnom/custom-mats-list-cleanse
Saves a significant amount of memory from empty material lists with 2 lines of code
2019-10-17 20:41:24 +13:00
ninjanomnom ad0f3f69f2 Saves a significant amount of memory from empty material lists 2019-10-17 00:10:29 -04:00
carlarctg 3078bcd3f4 Monkey energy nerf redux (#46955)
* I JUST

* WANT TO

* FOR

* GRILL

* SAK

* Revert "GRILL"

This reverts commit 4dbfe009e085cf19dd5554946c437e1138be131a.

* Revert "I JUST"

This reverts commit a670247a0ddbd96cdbc84ebba224e86490a6872d.

* cronched

* Merge branch 'master' into i-just-want

* fixed'ed
2019-10-16 17:11:34 -07:00
carlarctg cc999b2815 Twat carpets have reagents/ Oil is now considered Fuel (#46930)
* bra

* ME GRAMMAR GOOD?

* asbestos in your lung

* Merge branch 'master' into CARPET

* Merge branch 'master' into CARPET

* bruh

* Revert "bruh"

This reverts commit 186de868197ee5904ae2e72060736dc3a505f66d.

* Revert "Revert "bruh""

This reverts commit a855f2b838f02b852fb16f4a15123ca5a26b858f.

* orange man, reasonable

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: Fel <fludd121@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

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

* cobby is a good amnitni

* e
2019-10-16 17:30:18 -04:00
Tony 39e47c8bf2 fixes seiver healing far more rads than intended and having incorrect reaction name (#47107)
also removes some unused defines
2019-10-16 17:14:01 -04:00
Fikou 340ba6f109 fixes cavity surgery with advanced cautery (#47109)
* shdghf

* c

* bitch
2019-10-16 17:13:02 -04:00
skoglol c214712880 Adds a max temperature to fusion (#47073) 2019-10-16 22:06:59 +02:00
Jeremiah Cooley 9c826b98df Obscured turf check no longer requires density (#47015)
* Obscuring floor no longer requires desnity

* Doors now toggle PREVENT_CLICK_UNDER_1

* IsObscured loop refactor

* Explicit flag unset
2019-10-16 13:47:01 -04:00
nemvar 9467c73899 Checks if the tick has stopped. 2019-10-16 19:25:16 +02:00