Commit Graph
7135 Commits
Author SHA1 Message Date
alex-gh c36a997703 Added duplicate name checking. 2018-10-24 14:42:19 +02:00
Aurorablade 654ed40fa8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-10-24 02:21:36 -04:00
Unknown 1cd8d2f98f Surgical Trays
Adds Surgical Trays
2018-10-22 17:37:51 -04:00
AffectedArc07 dbfeba6d59 Merge branch 'space-ruin-number-one' of https://github.com/SamHPurp/Paradise into ghost-spawns 2018-10-22 20:39:31 +01:00
Certhic e8597c897d removed unused pretend weapon code 2018-10-21 21:04:01 +02:00
tigercat2000 720bc1da8b Merge remote-tracking branch 'upstream/master' into SPIN_ME_RIGHT_ROUND 2018-10-21 11:46:39 -07:00
Certhic b5e8e5e88f fix: autopsy scanner unresponsiveness 2018-10-21 20:41:32 +02:00
Purpose 2ebf971806 resolved icon conflicts 2018-10-21 11:46:39 +01:00
Purpose 88afb698d1 Fixes flashlight not calling parent proc correctly 2018-10-21 11:28:59 +01:00
alex-gh 20f0520398 Fixed nuke ops being anonymized. 2018-10-21 09:50:33 +02: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
Purpose 8a6bbd6aad Adds glowsticks 2018-10-20 09:34:45 +01:00
alex-gh d31d2d71a0 src removal 2018-10-19 15:32:50 +02:00
alex-gh 6a4d878940 Makes syndicate comm channel pseudonymous. 2018-10-19 14:34:47 +02:00
Purpose 47e814cf51 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into space-ruin-number-one 2018-10-19 10:47:57 +01:00
variableundefined 152a350538 Deconflict 2018-10-19 16:07:04 +08:00
Mark MakandGitHub 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 MakandGitHub 4bc1a1c1ef Merge pull request #9363 from MarsM0nd/Refactor_UID
Href refactor: macros and playerpanel
2018-10-19 07:46:42 +08:00
tigercat2000andGitHub dbc3d17cc5 Merge pull request #9857 from Agameofscones/ID_Sticker_Redux
ID_Decal Sprites
2018-10-18 11:26:59 -07:00
Mark MakandGitHub 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 MakandGitHub b418ee8401 Merge pull request #9828 from datlo/honkinfiltrationkit
Adds the Honk Brand Infiltration Kit
2018-10-17 21:35:06 +08:00
Mark MakandGitHub 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
Purpose 621a2a7f9d bed time 2018-10-15 00:47:13 +01:00
tigercat2000andGitHub 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
variableundefinedandGitHub 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
variableundefinedandGitHub 4de5284557 Merge pull request #9677 from DesolateG/global
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
tigercat2000andGitHub 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