Commit Graph

49665 Commits

Author SHA1 Message Date
skoglol 1986466aa7 Fix converting riot shield subtypes to strobe shields (#48541)
Basically this would let you upgrade fake roman bucklers to fully 
fledged riot shields with a flash on them.

Also fixed some inconsistent list indentation.
2020-01-04 22:25:38 -08:00
AnturK e624cabe5d Fix various runtimes (#48563)
The grille one could use a lower level solution eventually. As in 
separation of simple animal attack/visuals/aftereffects but that's 
bigger refactor.

* Fixes explosion dismemberment runtime.
* Fixes removing pen from PDA runtime.
* Mulebot bullet act runtime.
* Trying to refuel plasmacutter with fuel runtime.
* Fixes grille runtime.
* Teslium reaction runtime
* lavaland elite win runtime
2020-01-04 22:13:10 -08:00
oranges 70bb8fde34 Some changes suggested by lummox 2020-01-05 05:12:06 +00:00
skoglol 0abe5a30fd Merge pull request #48120 from TheChosenEvilOne/market
[READY] Black Market - The Basics
2020-01-05 02:20:59 +01:00
skoglol 9b86897025 Merge pull request #48559 from actioninja/tguin-tinynukefix
Makes the nuke console update when you click arm
2020-01-04 22:54:04 +01:00
skoglol 04880ca76c Merge pull request #48556 from ShizCalev/caltrop-fix
Caltrop / glass / lightbulb crossing fixes
2020-01-04 21:56:26 +01:00
skoglol 38b913c820 Merge pull request #48560 from BadSS13Player/master
Fixes typo
2020-01-04 21:52:03 +01:00
skoglol af38d14ed1 Merge pull request #48557 from JMoldy/wandfix
Fixes wand recharge
2020-01-04 21:46:21 +01:00
skoglol e52021a590 Merge pull request #48549 from CitrusGender/hedges
Adds hedges
2020-01-04 21:43:07 +01:00
skoglol c7812722de Merge pull request #48466 from OnlineGirlfriend/ginger-ale
[READY] Adds Sol Dry (ginger ale) and Moscow Mule
2020-01-04 21:42:21 +01:00
skoglol d77469c5f3 Merge pull request #48522 from Mickyan/trimdecal_update
Adds more trim decal styles
2020-01-04 21:08:43 +01:00
Arkatos1 127fde2606 Megafauna mobs are no longer deaf (#48538) 2020-01-04 21:01:16 +01:00
TheChosenEvilOne 4ab3467ff2 Border firelocks no longer crush mobs (#48506)
* Border firelocks no longer crush mobs.

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

* can_crush instead.

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

* No CheckForMobs if !can_crush

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

* ae

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-04 12:34:27 +01:00
Rob Bailey ba876548f3 Revert "[ready] Smooth-ish move rising: revengeance" (#48156)
Reverts #47817

People are complaining about motion sickness and I don't know what the issue is.
2020-01-04 23:58:31 +13:00
oranges 15c59a51cd Revert "Only allow one call to IsBanned to process at a time (#48529)"
This reverts commit b4e84ddadf.
2020-01-04 15:43:09 +13:00
oranges fa41c23539 Merge pull request #48537 from kriskog/waddling
Fixes waddling
2020-01-04 15:34:51 +13:00
TheChosenEvilOne 0320d2b894 "Save yourself some trouble and put the turf in a var beforehand"
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-03 23:25:48 +02:00
TheChosenEvilOne 36611cc839 just like that, issues are gone™️
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-03 23:24:51 +02:00
oranges 591eac4367 Add a spam limiter to the goonchat topic calls (#48524) 2020-01-03 15:21:00 -05:00
oranges b4e84ddadf Only allow one call to IsBanned to process at a time (#48529)
Potential improvements, store the list on a subsystem, also include
ip/ckey

Clear on a timed basis instead of after finishing
2020-01-03 21:15:49 +01:00
TheChosenEvilOne acd7dd6aeb Drop the pod
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-03 19:07:16 +02:00
TheChosenEvilOne b18d65cb37 Merge remote-tracking branch 'origin/master' into market 2020-01-03 17:32:03 +02:00
Rob Bailey 2900289e2a tgui-next launchpad (#48536)
* remote launchpad + launchpad console

* fixes

* rebuild
2020-01-03 16:24:52 +01:00
TheChosenEvilOne c851f1aebe Actually perhaps remove the money?
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-03 16:46:58 +02:00
TheChosenEvilOne 9544ed5ae2 Reviews
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-03 16:40:17 +02:00
TheChosenEvilOne c96a81469b Merge remote-tracking branch 'origin/master' into market 2020-01-03 16:15:14 +02:00
BadSS13Player 4b7555d6bb Update coil.dm 2020-01-03 13:15:55 +00:00
actioninja 44170a8076 super important extra critical fix 2020-01-03 03:34:34 -08:00
thebleh 1a477adc37 Fixes Structures and Coin Press UIs being usable by ghosts (#48531)
* fix structure uis not checking interactivity

* fix coin press being usable by ghosts

* cleaner way of getting parent return
2020-01-03 11:36:50 +01:00
thebleh 8794be3a5c Fixes not being able to change the ID on Public Nanite Chamber circuitboards (#48528)
* fix null check in public nanite chamber board

* fix prox check on changing circuitboards

* add text feedback to the board prox checks
2020-01-03 11:35:39 +01:00
JMoldy f811603c85 Fixes wand recharge
Self-charging wands were able to hold one extra charge by allowing the recharge counter to increase indefinitely when the number of charges reached the maximum number of charges.
2020-01-03 02:31:10 -08:00
Rob Bailey cbad6e4de5 Contractor Uplink tgui-next overhaul (#48453)
* tgui next contractor interface

work

cleanup

more work

getting close now

final

build

more stuff for wanted messages

rebuild

spelling

* fixes

* rebuild

* fix

* disable button when contract not active or extraction enroute, disable limited when depleted
2020-01-03 11:29:38 +01:00
ShizCalev ea56f83e58 Caltrop / glass / lightbulb crossing fixes 2020-01-03 04:47:06 -05:00
Rob Bailey 8c6c8ca328 Ton of small tgui-next uis (#48470)
* small uis

intellicard

slime body swapper + wipe button in intellicard

gulag teleporter

notification preferences

mulebot

dropdown scrolling

working scroll focus

window size change

build

sleeper

emergency shuttle console

eightball revert

small fix

support old pda as well

typo fix

rebuild

* readme update

* spelling

* rebuild
2020-01-03 08:10:16 +01:00
Rob Bailey 2a2c9dd227 tguin haunted eight ball (#48500)
* tguin eight ball

always interact

* whoops
2020-01-03 07:30:46 +01:00
ArcaneMusic 1e52e13936 Uncurses Polycircuit Stack Marginally. (#48474)
* Whoops

* Hm.

* Neat, just needed some returns

* Works
2020-01-03 07:00:13 +01:00
Citrus 78f1ec9343 Merge remote-tracking branch 'origin/master' into hedges 2020-01-02 20:15:44 -05:00
ArcaneMusic 39b58f1edc Adds several more uses for plastics (Trinkets, Trash, Decor, and Killing the Environment) (#48337)
* Initial Commit, Plastic Boxes and Soda Rings. Basic carp interaction.

* Beads, trash created from breaking plastic, carp eat plastic properly.

* Cleans up sprites, adds designs to autolathe, and adds plastic plants

* Icon Conflict more like Ion Comblict because I can't spell

* Oh neat, there's already a party crate. Added Beer/Soda 6packs to the crate, adjusted price accordingly.

* Aaaaaaaaaa runtime loop.

* You win this round travis.

* Makes the in-hand sprite the soda can sprite because honestly it's close enough don't @ me

* Typo.

* Merge conflict, style changes, FINE CARP DON'T BREATHE.

* BEGONE CONFLICT BEGONE FROM ME
2020-01-03 02:13:43 +01:00
Citrus 3134cceb31 Merge branch 'hedges' of https://github.com/CitrusGender/tgstation into hedges 2020-01-02 20:09:00 -05:00
Citrus 3ef84401c2 makes opaque hedges able to smooth 2020-01-02 20:08:38 -05:00
Rob Bailey d40713f70d Configuration + NTNet Relay (#48476) 2020-01-03 00:14:04 +01:00
moo 4022d0c427 Bumps up Surgery XP gains, Fixes Surgery XP Gains, Fixes Surgery Failure Bug (#48231)
* works on my machine

* saving is a sin 1% of the time!

* works... on... my... machine...?

* i can't test this but it worked on my machine too

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* more testing /w TW

* caps XP gain (per iteration) for TW

* no skinnies

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
2020-01-02 23:48:15 +01:00
skoglol 2d88b777d3 Adds maint oddities, less stranges, no invisible pipes. (#48489) 2020-01-02 17:34:06 -05:00
Citrus dfa2ab6a6c Merge remote-tracking branch 'origin' into hedges 2020-01-02 17:03:26 -05:00
Tony 1fc36ba4cd Slightly tweaks medigel ratios, changes instabitaluri description (#48355)
* adjusts medigels to spray round numbers, buffs patches to be equivalent to a 10u spray, warns of instashdfghsdf's toxicity on the bottle/patch

* not today, patches
2020-01-02 16:59:45 -05:00
swindly ee056e6cba fixes check_contents blacklist check (#48520) 2020-01-02 14:53:09 -05:00
TheVekter 7bbec42593 Moves Geneticist to a purely Science job 2020-01-02 09:37:38 -06:00
TheVekter da2b817e44 [READY] Moves Genetics to the Science department and makes Gen… (#48397)
* great googly moogly it's all gone to shit

* Fixed geneticist ID, moved in job list

* This is what I get for not building

* Fixed HUD sprite

* Finalized move to R&D code areas and updated sprites

* Mapping fixes on Meta

* Boxstation's turn and some Meta fixes

* Fixing map conflicts

* Moves genetics to science

SQUASHED:

great googly moogly it's all gone to shit

Fixed geneticist ID, moved in job list

This is what I get for not building

Fixed HUD sprite

Finalized move to R&D code areas and updated sprites

Mapping fixes on Meta

Boxstation's turn and some Meta fixes

Fixing map conflicts

* lmao travis

* okay you can pass travis this time

* DeltaStation changes

* lmao access bullshit

* Kilo also a few code/sprite fixes

* Pubbystation

* Removed gondolas because people hate fun
2020-01-02 06:15:35 -08:00
skoglol 95b4d04185 Fixes waddling 2020-01-02 14:20:24 +01:00
Mickyan 2e89caaec3 too many decals 2020-01-01 21:39:44 +01:00