Commit Graph

29373 Commits

Author SHA1 Message Date
DeAndre a9b1ada28c Merge branch 'master' into Somethingforthekids 2019-10-20 13:26:13 +02:00
81Denton 59432da72e Merge pull request #47190 from Time-Green/plumbing-fixes
Plumbing fixes and tweaks
2019-10-20 12:04:32 +02:00
Time-Green 66045b25d3 stops ducts from constantly runtiming on being placed down
credits to steamport for finding it, I completely and utterly forgot a pretty obvious mistake
2019-10-20 09:35:58 +02:00
ArcaneMusic e8160371a7 Adds the Cleric's Den ruin, and Datum Maces. (#46915)
* REWROTE EVERYTHING

* And these too

* Mapmerger as usual

* Qust changed some datum mat stuff, fixed

* Updated the rune sprite to be in-line with blood cult style runes.

* Uses a less degenerate sprite for the rune
2019-10-20 00:24:58 -04:00
ATH1909 d843abea27 Fixes milk (#47168)
* Update species.dm

* Update plasmamen.dm

* Update golems.dm

* Update skeletons.dm

* Update toxin_reagents.dm

* Update plasmamen.dm

* Update golems.dm

* Update skeletons.dm

* Update toxin_reagents.dm

* Update golems.dm

* Update plasmamen.dm

* Update skeletons.dm

* Update skeletons.dm

* Update golems.dm

* Update plasmamen.dm

* Update skeletons.dm

* Update golems.dm

* Update species.dm

* Update plasmamen.dm

* Update skeletons.dm

* Update golems.dm

* Update plasmamen.dm

* Update skeletons.dm

* Update plasmamen.dm

* Update skeletons.dm

* Update plasmamen.dm

* Update golems.dm

* Update skeletons.dm

* Update toxin_reagents.dm
2019-10-19 22:38:35 -04:00
Time-Green d386f46e6d exclude plumbing explosions from default admin log 2019-10-19 23:52:13 +02: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
Time-Green 338e072873 allows direct machine to machine construction
and fixes being able to have ducts running under machines
2019-10-19 13:45:30 +02: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
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
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
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
Time-Green 8a0649c63d fixes multilayer ducts being off-center 2019-10-18 15:34:18 +02:00
Time-Green c02fdb64f6 plumbing bugs and fixes 2019-10-18 14:59:03 +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
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
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
nemvar c62bfc5616 Travis warning begone (#47165)
* Travis begone

* Fixes other part of this
2019-10-17 20:41:10 -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
nemvar 1c257a6302 fixes sand recipes (#47113) 2019-10-17 11:04:32 +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
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
nemvar 39fead370a Removes the absolute istype fest from footsteps (#47030)
* Removes the absolute istype fest from footsteps

* Slightly switches some stuff around. No need for a special xeno proc

* Adds error catcher. Also adds footstep to dark wizzies

* Adds footsteps to sloths

* Brutally murders the initialize footstep proc.

* Footsteps to paperwizard

* Better yet?

* fixes fucky wucky

* Fixes the return value. Makes it easier to follow what's going on.

* flips around conditions

* Now supports strings.

* Moves autodoc
2019-10-16 10:24:41 -04:00
zxaber f034297567 rip ratvar (#47101) 2019-10-16 13:25:24 +02:00
Time-Green bca59b9a50 [READY] Plumbing: Endgame (#46759)
cl
add: Plumbing equipment is now available through the medical protolathe. It's under medical machinery boards
add: Add's a new chemistry area on metastation for chemical factories. It's located left of main surgery.
tweak: Chemistry has been turned into the Apothecary. It's basically normal chemistry, but Medical Doctors have acces aswell.
tweak: The smoke machine is now plumbing compatible. Put this knowledge to good use.
sprite: Thanks to @CRITAWAKETS for the plumbing RCD sprite!
/cl

Finally adds plumbing to the game!

Chemistry has been turned into the apothecary. For all intents and purposes it's old chem, but doctors have acces.

West of main surgery is now the new chemistry factory area.

I've also had to move stuff around alot, because you can't just add a big new room without having stuff in the way.

Currently only on metastation. I'm completely drained from adding it to meta alone and doing all maps right now will burn me out.
2019-10-17 00:10:30 +13:00
MadoFrog f63bb8bf5a Adds Shrine Maiden's Outfit to the Costume Vendor (#47090)
* Adds Shrine Maiden's Outfit

* Adds the Shrine Maiden's Wig

* Adds the gohei as a null rod transformation

* Gives the gohei purification properties

* Shrine maiden's items now lack religious significance

There's a profound comment to be made here, but I'm not smart enough to make it.

* Icons added back after rebase

* Addresses requested changes

* Adds the gohei's hitsound

* Update suit.dmi
2019-10-15 21:41:23 -04:00
Mike Long e1034675f4 Record the number of infernal contracts of each sort signed. This should give a bit more information for a potential future rework. (#47050) 2019-10-15 20:57:33 -04:00
Jeremiah Cooley 8c1e88903a Coronary bypass can be done with adv tools (#47082) 2019-10-15 17:57:13 -04:00
Aleksej Komarov 5521c8ebee [READY] tgui-next: Initial PR, speedy new Air Alarm interface. (#46764)
* Initial tgui-next commit

* Improve dev server, slight changes to layout.

* Add more components, fix dragging, finalize scrubber list

* Complete an air alarm interface.

* Multiple improvements based on feedback

- LabeledList now has a "buttons" prop, where you can put buttons.
- Improved Box and Flex components
- Whole UI is now dimmable if non-interactive
- Basic documentation of components (Box and Flex so far).
- Icon and Box now accept a "color" prop.
- Routing improved in "Layout" component, you can now specify whether an interface is scrollable.

* Less harsh dimming

* Redux, Toasts

- Fixed inconsistent backend updates with Redux.
- Added Toasts which are currently unused, but are functional.

* acclimator + ai airlock ui

* Add a progress bar component, implement resizing

* Fix a zero in title bar

* Add a linter to keep shit tidy, fix danger level mapping, add some more docs

* better ai door interact ui

* final ai airlock interface

* Fix issues with code, enforce hard 120 line length cap, automerge binaries

* Implement hot module reloading

* Fix progress bar, add color support

* Fix ProgressBar baseline alignment issues

* Remove unwanted padding on the bottom of the LabeledList.

* Component improvements

- Fix baseline issues with Button and ProgressBar components
- Box how inherits props from Box
- Atomic colors and Button colors are now auto-generated, all range of colors supported

* Chem Dispenser UI, animated numbers, more style fixes

* Add an IE8 polyfill

* Intermediate state of fixing IE8

* Lots of shimming and general misery

* Fully working old TGUI chainloader for IE8, more pipeline improvements

* Support title-less Sections

* Delete Yarn, use Lerna for workspace management

* Improve maths and animated numbers

* Fix loss of focus for scrollable content, activate buttons with keyboard

* Attempt to bust the cache, grab focus on keyboard presses too

* Fix hot module replacement by manually pulling replaced modules.

* backend logging

 un-nuke line endings

changes without insane line endings

* helper procs + href support

* slight optimization

* compiles

* Redux, Hotkeys, Kitchen Sink (for UI testing), Tabs component

* Push logs to backend, small kitchen sink changes, tab fixes

* Update component reference in README

* Small fixes

* Next bunch of IE8 fixes, PureComponent optimization for Inferno

* Delete old tgui html

* Log the event of loading the old tgui

* Enable tgui logging on server by default

* Final solution

* Extract routes into a separate file, fix ChemDispenser bug

- Chem dispenser was needlessly disabling transfer amount buttons

* Disable baseline alignment for vertical tabs

* Fix tabs and box units

- Tab content was not taking full page width
- Box can now accepts strings as units, which will be treated as raw style values.

* Fix tgui on Terry

* Fix sending all logs with an "error" flag

* Some macro UI component changes and improvements

- Refer to README.md diff to see what's new

* Tooltip component

* Add support for themes, nanotrasen logo is back

* Clockwork theme hotfix

* Slight adjustment to logo positioning

* Actually proper solution for logo positioning

* Fix color maps

* tgui-next thermomachine interface

* tgui-next canister interface

* Add icon_class_name proc to asset cache

* Lots of stuff backported from actioninja's repo

* Cleanup oopsies

* Cargo UI adjustments

* Nuke lodash

* Minor fixes and cleanup

- Remove local Inferno package in favor of upstream Inferno
- Fix "initial" prop on AnimatedNumber
- Force fancy=0 for IE8
- Click-through dimmer

* Add a bat file for dummies

* podlauncher interface fix

* Update README, assert code dominance

* Clarify usage of event handlers in Inferno

* Document LabeledList.Divider

* Fukken grammar

* fixes cellular emporium readapt button not working

* fixes incorrect action on button in atmos control interface

* remove unneeded data from airlock electronics ui

* Set +x mode on bin/tgui

* Fix filename cases

- They were untracked by git on windows

* Ignore package lock, make batch more robust

- package-lock.json is very random and unreliable as fuck. Yarn was better.

* Build tgui-next in travis

* bruh

- fixes tgui error reporting

* logging cleanup + always log
2019-10-15 17:20:37 +02:00
carlarctg 4543ac94bd reflector vested (#47086) 2019-10-15 17:06:37 +02:00
ATH1909 8c8b9b22b8 Removes the "To Kill" wish option from the wishgranter (#47084)
* Update wildwest.dm

* Update wildwest.dm
2019-10-15 17:03:27 +02:00
Fikou 7ca0ae8ce7 shotguns are now a heavy weapon (#47039)
* awoo

* awoo

* n

* e
2019-10-15 16:49:33 +02:00