Commit Graph

6066 Commits

Author SHA1 Message Date
skoglol
938e66f62c Adds sorting to most input() lists (#47117)
* Adds sorting to most input() lists.

* Sorted some global lists, added more input sorting

* Should now use correct sort everywhere.

* compiles

* Last fixes.
2019-10-22 04:28:42 -07:00
nemvar
ac075a56f0 Fixes various skill bugs. (#47279)
* Having none skill whatsoever will now give you the worst possible skill modifier.
Viewing your skills is now formatted correctly.
Skill names are now capitalized. Looks slightly better.

* fileendings

* Needs to check for null this one.

* Newline
2019-10-22 04:20:53 -07:00
XDTM
efe63e3b47 Nanite program rebalancing, added two new mood programs (#47227)
* Nanite program rebalancing, added two new mood programs

* stealth immunity
2019-10-21 22:09:42 +11:00
Jordie
66d1ae42f5 Merge pull request #47133 from XDTM/NanoSecrets
Adds the Reduced Diagnostics nanite program
2019-10-21 21:47:18 +11:00
Bobbahbrown
1abf64574b Fixes Runtime with Determining Resource Amounts in Items (#47237)
* runtime begone

* web edit to take ninjas recommendation lol

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-10-21 21:44:55 +11:00
81Denton
f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
81Denton
f76939795f Merge pull request #47225 from KetasDotepasto/ket-splitterFix
Plumbing: Fixes the splitter not switching.
2019-10-20 15:09:41 +02:00
81Denton
1c918f410e Merge pull request #47226 from nemvar/smonktime
Smonktime
2019-10-20 15:08:58 +02:00
XDTM
27c91be832 Merge branch 'master' of https://github.com/tgstation/tgstation into ThisRULES 2019-10-20 12:18:16 +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
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
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
kingofkosmos
56b8461580 Fixes. 2019-10-19 22:17:50 +03: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
nemvar
39f6d36d5a Minor fuckup fixed. Comment readded. 2019-10-19 14:48:58 +02:00
nemvar
1ca1e9c6d1 Smoker runtime fixed once and for all. 2019-10-19 14:47:33 +02:00
Ketas Dotepasto
ddaed83398 Fixes the splitter not switching.
Fixes the problem that the splitter does not switch back to sending
chemicals straight. This resulted in the splitter sending chemicals
straight exactly once, then forever sending them to the side.
2019-10-19 13:49:42 +02: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
XDTM
bcfe8f36db Merge branch 'master' of https://github.com/tgstation/tgstation into ThisRULES 2019-10-19 02:08:26 +02: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
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
Time-Green
c02fdb64f6 plumbing bugs and fixes 2019-10-18 14:59:03 +02: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
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
spookydonut
cca969feea change these away from defines (#47105) 2019-10-17 10:10:51 -04:00
kingofkosmos
52325eda25 Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/structures/beds_chairs/chair.dm
#	code/game/objects/structures/lavaland/geyser.dm
#	code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
#	code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
#	code/modules/paperwork/contract.dm
2019-10-17 06:02:06 +03: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
XDTM
21e54e3271 Adds the Reduced Diagnostics nanite program 2019-10-16 19:29:38 +02:00
nemvar
9467c73899 Checks if the tick has stopped. 2019-10-16 19:25:16 +02:00
nemvar
ced45cfddd Fixes forceMove to null 2019-10-16 19:21:41 +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
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
XDTM
488565e04b Merge branch 'master' of https://github.com/tgstation/tgstation into ThisRULES 2019-10-15 18:53:22 +02: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
KomradeSpectre
9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
PKPenguin321
deeac2355a Big storage containers (like bags) in smaller ones (like boxes) can't have items placed in them (#46983)
* Bags in boxes can't have items placed in them

Untested webedit
Fixes https://github.com/tgstation/tgstation/issues/46345

* smooths a redundant check

* more squishing
2019-10-14 07:05:06 +02:00
Qustinnus
908ccfe7b3 Fixes some material datum bugs (#47049)
* fixes

* chair

* ass

* fixes

* dumb

* done

* fix
2019-10-14 00:36:56 -04:00
kingofkosmos
6d28a175d5 Fixes a few broken spans. 2019-10-13 21:51:07 +03:00
XDTM
08221ce9da Merge branch 'master' of https://github.com/tgstation/tgstation into ThisRULES 2019-10-13 15:44:38 +02:00
kingofkosmos
228b4282ca Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/modules/mob/dead/new_player/new_player.dm
2019-10-13 15:21:17 +03:00
kingofkosmos
259626a8b4 Removes excess spaces in messages. 2019-10-13 14:36:43 +03:00
James
a05d954b45 Split personalities can now communicate directly (#46875)
About The Pull Request

This PR allows people with the split personality trauma to communicate with the stranger and vice versa through an action button. I also considered adding an option for the active player to release control but I felt that would be breaking the spirit of brain traumas a bit much.
Why It's Good For The Game

Split personality has always been a situation where the second player's only real option is "How many times can I shout "I'm Gay"/WGW over radio and try and avoid surgery until I inevitably get removed?" Don't get me wrong, you can still do that, but I aim in this PR to give players another option to get some of that sweet RP in. The main argument I can see coming up against this change is that traumas are supposed to be negatives, but how I see it, this doesn't make Split Personality a positive trauma so much as it allows roleplay similar to how you can roleplay as a paraplegic war veteran or as an ex-security officer who developed a phobia following an 'incident'. I'm happy to add a cooldown to the action if it proves to be an issue.
Changelog

cl
add: Split personalities can now communicate with an action button
/cl
2019-10-13 16:54:12 +13:00
4dplanner
27413bcf40 Shade fixes (#47031)
About The Pull Request

fixes #46572 (I think)
Why It's Good For The Game
Changelog

cl
fix: shades now heal properly upon re-entering a soulstone (previously they would temporarily heal, then take back all the damage next time they were hit)
fix: shades summoned from a soulstone are no longer invincible
/cl
2019-10-13 16:46:25 +13:00
Arkatos1
b6aba70dfa Good music fix (#47014)
About The Pull Request

This PR fixes a bug where you could receive positive effects of hearing good music even if you did not hear any actual music due to being deaf, for example.

Fixes #43720
Why It's Good For The Game

Less bugs.
Changelog

cl Arkatos
fix: You will now only receive positive effects of hearing good music if you can actually hear the music.
/cl
2019-10-13 16:44:23 +13:00
Qustinnus
0d46e6c441 You can no longer slip on fireman-carried clowns (#47000)
* trips

* yikes

* im braindead
2019-10-13 16:43:40 +13:00
kingofkosmos
dba1d2eb2d Fail-messages from notice-spans to warning-span. 2019-10-12 21:24:52 +03:00
kingofkosmos
280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03:00
Rob Bailey
e1683f674f Merge pull request #46978 from willox/duplicate-variable-stuff
removed a bunch of duplicate member variable definitions and entirely duplicated types
2019-10-12 03:44:15 -07:00
William Wallace
4f8b437069 'frozen' food crafting category now works (#46970)
* ice crafting category now works

* un-murder rainbow snowcone
2019-10-11 15:46:45 -04:00
Fhaxaris
c2efff7919 Fixes my horrible mistake (#47001)
speed merge dis
2019-10-10 18:23:00 -04:00