tigercat2000
720bc1da8b
Merge remote-tracking branch 'upstream/master' into SPIN_ME_RIGHT_ROUND
2018-10-21 11:46:39 -07:00
tigercat2000
4d17f14de0
Radial Menu Port & RCD Refactor-Upgrade
...
This commit ports tgstation/tgstation#39991 and parts of
tgstation/tgstation#40350 .
Primary changes:
- A radial menu system has been introduced, which can contain any
arbitrary sprite and be applied to any arbitrary object.
- RCDs take advantage of this radial menu system; Using them in-hand
will no longer directly bring up the UI, but instead, will bring up a
radial menu that can directly change between modes (as well as access
the old UI)
2018-10-20 22:59:39 -07:00
variableundefined
e2f7b7e388
Deconflict once again
2018-10-21 10:18:15 +08:00
variableundefined
600de8ba24
Deconflict 1
2018-10-21 07:56:55 +08:00
Desolate
91ae4713b8
removes mushroom changes
2018-10-20 16:34:24 -05:00
joep van der velden
7253936c93
Me smurt. Me not save change
2018-10-20 14:05:23 +02:00
joep van der velden
3699822db0
Added notifications for the user
2018-10-20 13:35:05 +02:00
variableundefined
152a350538
Deconflict
2018-10-19 16:07:04 +08:00
Mark Mak
91dcf447ec
Merge pull request #9888 from Fox-McCloud/spark-refactor
...
Refactors Spark Spread Activation
2018-10-19 08:41:03 +08:00
Fox McCloud
73200c942d
tweak
2018-10-18 19:50:24 -04:00
Mark Mak
4bc1a1c1ef
Merge pull request #9363 from MarsM0nd/Refactor_UID
...
Href refactor: macros and playerpanel
2018-10-19 07:46:42 +08:00
tigercat2000
dbc3d17cc5
Merge pull request #9857 from Agameofscones/ID_Sticker_Redux
...
ID_Decal Sprites
2018-10-18 11:26:59 -07:00
Mark Mak
35591ad940
Merge pull request #9889 from Squirgenheimer/cryoruntimefix
...
adds sanity check to show_to for storage items
2018-10-18 08:54:08 +08:00
Squirgenheimer
9280f9f9bd
adds sanity check to show_to for storage items
2018-10-17 18:33:50 -04:00
Fox McCloud
3825b4e1d5
Refactors Spark Spread Activation
2018-10-17 14:31:07 -04:00
Mark Mak
b418ee8401
Merge pull request #9828 from datlo/honkinfiltrationkit
...
Adds the Honk Brand Infiltration Kit
2018-10-17 21:35:06 +08:00
Mark Mak
a89f886a37
Merge pull request #9858 from Ty-Omaha/stunbaton-runtime
...
Fixes stunbaton runtime
2018-10-15 13:17:30 +08:00
Ty-Omaha
2862503d2b
stunbaton runtime comment
2018-10-15 01:01:39 -04:00
Ty-Omaha
adbf0bb2cc
stunbaton runtime fix
2018-10-15 00:54:17 -04:00
Gwydion Brain
d7ecb3bd8c
Typo
2018-10-14 21:12:42 -07:00
Gwydion Brain
812c142fe9
Lil fixo
2018-10-14 21:06:37 -07:00
Gwydion Brain
09313bbea1
Initial
2018-10-14 21:04:12 -07:00
tigercat2000
315491786a
Merge pull request #9838 from variableundefined/OreStackQOL
...
CtrlShiftClick for stack
2018-10-14 07:19:38 -07:00
Purpose
d11a0ac95b
visibility
2018-10-14 11:52:09 +01:00
variableundefined
b097b06b72
CtrlShiftClick for stack
2018-10-13 23:04:50 +08:00
variableundefined
747684927a
Formatting fixes & spanning fish tank
2018-10-13 22:12:37 +08:00
variableundefined
65c246c1c9
TG container_type refactor
2018-10-13 08:20:52 +08:00
Mars
984339ce42
Merge-conflict fix + check for null rather than type.
2018-10-12 18:59:54 +02:00
datlo
ac5cc480b9
Adds the Honk Brand Infiltration Kit
...
Also adds the clown mask voice changer as part of the kit
2018-10-12 17:02:55 +01:00
variableundefined
569f68b128
Merge branch 'master' into RelPath
2018-10-12 14:08:19 +08:00
variableundefined
376cdc709a
Merge pull request #9818 from farie82/twohanded-fix
...
Fixes the giving of required two handed items and chainsaw stuf
2018-10-12 13:24:19 +08:00
variableundefined
4de5284557
Merge pull request #9677 from DesolateG/global
...
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
tigercat2000
98c77fc466
Merge pull request #9343 from variableundefined/OreTGPort
...
Port over tg ore stack and stack merging
2018-10-11 19:34:13 -07:00
variableundefined
108ebfed3a
Formatting improvement
2018-10-12 07:57:58 +08:00
joep van der velden
c96adec91f
Fixed it
2018-10-11 22:55:10 +02:00
Desolate
f7627d2fcb
Resolves conflicts.
2018-10-11 05:36:22 -05:00
variableundefined
309e3b04f6
Clears up some relative pathing part 1
2018-10-10 23:39:34 +08:00
lass9030
8111331094
Replaced code with procs, added return values.
2018-10-09 16:21:11 +02:00
Mars
d9b60a7bfb
Fix merge conflict
2018-10-09 09:41:37 +02:00
variableundefined
6b1b38d4f1
Port over tg ore stack and stack merging
...
Meta
Birbfix
Maxi
Re-add automatic satchel ore pickup (oops)
Mecha formatting
re
2018-10-09 10:06:03 +08:00
variableundefined
c2bf480622
Merge pull request #9631 from Birdtalon/ERT-changes
...
Gamma ERT Changes
2018-10-09 08:58:15 +08:00
Purpose
4d7dd5a6c9
dayum dats defined
2018-10-08 22:48:00 +01:00
variableundefined
bc4a042d57
Merge pull request #9546 from SamHPurp/oh-come-on,-who-throws-a-baton,-i-mean-really
...
Thrown Stunbatons have a low chance to stun
2018-10-08 15:06:54 +08:00
Crazylemon64
3db4229918
First big chunk of the refactor
...
mid-refactor of `take_overall_damage`
Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs
Allows the dead to examine
Removes the `blinded` var
Refactor cyborg components so vision loss is instant
Robot life/death updates instantly
Adds instant updates for damage overlays and HUD icons for humans
Final reconciliation with the species refactor
Adds a stat debugging system and debugging logs
Also fixes instant death on species change
"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would
I used it to fix people dying instantly when changing species due to
temporary deletion of the brain
Fox's requests
Adds a more careful updating system to our reagents system
2018-10-07 17:52:04 -07:00
Birdtalon
074ee967e5
Merge branch 'master' into ERT-changes
2018-10-07 19:22:10 +01:00
Birdtalon
4151487c98
bugfixes
2018-10-07 18:49:48 +01:00
variableundefined
3c98bf5799
Merge pull request #9710 from SamHPurp/de-specifying
...
Reduces incorrect use of station names.
2018-10-07 22:52:27 +08:00
Purpose
63dfd411aa
Resolved merge conflicts... I hope.
2018-10-06 16:01:34 +01:00
Purpose
ea74920535
no no no no cyberiaaaaad
2018-10-05 20:57:41 +01:00
Birdtalon
f877e6b90f
adds sprite for T4
2018-10-03 22:20:05 +01:00
