cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-20 22:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,365 Commits 28 Branches 2 Tags
720bc1da8b40fa4df802aaabc2f0609f039899ee
Commit Graph

15691 Commits

Author SHA1 Message Date
tigercat2000
720bc1da8b Merge remote-tracking branch 'upstream/master' into SPIN_ME_RIGHT_ROUND 2018-10-21 11:46:39 -07:00
Purpose
9a6e3578d6 a an 2018-10-21 11:12:25 +01: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
Crazy Lemon
112bc6f23a Merge pull request #9377 from variableundefined/RelPath 
Code clear up - RelPath + commented code deleting
 2018-10-20 22:09:57 -07:00
tigercat2000
c1dd7dda32 Merge pull request #9837 from variableundefined/RevenantRefactor 
Improve revenant code a bit
 2018-10-20 19:44:19 -07:00
variableundefined
e2f7b7e388 Deconflict once again 2018-10-21 10:18:15 +08:00
tigercat2000
7cd2727256 Merge pull request #9924 from Squirgenheimer/explosiveholoparafix 
Explosive holoparasite fixes
 2018-10-20 18:51:17 -07:00
variableundefined
2771c17a0c Fixes inconsistent comment and no name on revenant prompt 2018-10-21 09:45:41 +08:00
Squirgenheimer
5d4ada3ff2 adds another sanity check 2018-10-20 21:38:33 -04:00
Squirgenheimer
4bbe0a3f22 removes trailing returns 2018-10-20 21:22:50 -04:00
Squirgenheimer
df6bee335b Various guardian_bomb fixes 
-they will now respect opacity and direction of the atom they are disguised as
-they will no longer be triggered by objs and will instead trigger on the mob correctly
-automatic disarming now uses timer ss so no more deletion of the contained obj after already being triggered
-replaces loc assignments with forceMove
 2018-10-20 21:07:37 -04:00
variableundefined
600de8ba24 Deconflict 1 2018-10-21 07:56:55 +08:00
variableundefined
906804c430 Merge pull request #9920 from lass9030/post-equip 
Fix notice tag and closing span in job.dm
 2018-10-21 07:43:06 +08:00
variableundefined
45fdcb4c46 Merge pull request #9719 from SamHPurp/smoothing-improvements 
Icon Smoothing to StonedMC
 2018-10-21 07:41:47 +08:00
variableundefined
c240505535 Merge pull request #9913 from farie82/Cyborg-extinguishers-and-welders 
Borg fire extinguishers and welding tools now get refilled
 2018-10-21 07:34:12 +08:00
variableundefined
4285f3ffef Merge pull request #9562 from DesolateG/MUSHROOMMUSHROOM 
Refactors the global reagents lists to use the global SS.
 2018-10-21 07:32:14 +08:00
variableundefined
7c42d596bb Merge pull request #9567 from Bram961/master 
Window alt clicking utility
 2018-10-21 07:30:47 +08:00
Purpose
5b22462bcf Update code/game/jobs/job/job.dm 
Co-Authored-By: lass9030 <lass9030@gmail.com>
 2018-10-21 00:31:34 +02:00
lass9030
8f49bfb4a5 Fix notice tag and closing span 2018-10-21 00:12:52 +02:00
Desolate
91ae4713b8 removes mushroom changes 2018-10-20 16:34:24 -05:00
farie82
2018da1b8f Sleepy me. Fixed now 2018-10-20 20:35:20 +02:00
joep van der velden
4c37dda301 Fixed the spacing + used check_and_add() 2018-10-20 18:31:56 +02:00
Kluys
c62b0a1a1c Typo fixu 2018-10-20 18:15:14 +02:00
joep van der velden
f81bb85dfd Borg fire extinguishers and welding tools now get refilled 2018-10-20 17:06:35 +02:00
variableundefined
63d0ffbb97 Merge pull request #9910 from farie82/RCD-airlock 
Added notifications for the user on the RCD airlock creation
 2018-10-20 22:30:23 +08: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
farie82
5b45fe7f9a Merge branch 'master' into Holoparasite-spended 2018-10-20 13:12:15 +02:00
joep van der velden
1ce48e9602 changed the used message system 2018-10-20 13:08:23 +02:00
Purpose
0fc81f51e4 corrections 2018-10-20 10:18:23 +01:00
variableundefined
d67059102e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RelPath 2018-10-20 15:14:12 +08:00
variableundefined
78b7c146a5 Merge pull request #9810 from SamHPurp/suit-storage-units 
Refactors suit storage units
 2018-10-20 08:25:34 +08:00
Fox McCloud
f2e82da756 Merge pull request #9864 from variableundefined/ManualRevert 
Manually revert Purpose's smoothing PR
 2018-10-19 19:16:00 -04:00
joep van der velden
c6aa8a8466 Requested changes + smol fixes 2018-10-19 20:57:28 +02:00
joep van der velden
265b0079db Fixed it + refactor 2018-10-19 18:27:26 +02:00
variableundefined
152a350538 Deconflict 2018-10-19 16:07:04 +08:00
Mark Mak
05bd6bd088 Merge pull request #9843 from warior4356/Safe-Refactor 
Safe Refactor
 2018-10-19 12:35:59 +08:00
warior4356
fead9e552e Updated logo and description. Removed NT logo from UI 2018-10-18 18:36:56 -07: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
Mark Mak
690d7bd0d4 Merge pull request #9732 from TDSSS/ody-stuff 
New mech equipment: Jaws of life for Ody/Firefighter Ripley
 2018-10-19 06:54:38 +08:00
tigercat2000
dbc3d17cc5 Merge pull request #9857 from Agameofscones/ID_Sticker_Redux 
ID_Decal Sprites
 2018-10-18 11:26:59 -07:00
variableundefined
4869767d57 Revvie fixes 2018-10-18 10:45:07 +08: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
warior4356
f3fc4548b6 Requested code changes done, please recheck 2018-10-17 13:36:25 -07:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
Mark Mak
13d95c04e2 Merge pull request #9875 from lass9030/add-to-locker 
Add uniform to blueshield locker
 2018-10-17 21:36:11 +08: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