cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 04:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,365 Commits 26 Branches 2 Tags
720bc1da8b40fa4df802aaabc2f0609f039899ee
Commit Graph

29712 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
variableundefined
5c7867e3e1 Make oculine not expensive 2018-10-21 22:21:35 +08:00
joep van der velden
decfcb91b2 Fixed it 2018-10-21 12:47:38 +02:00
variableundefined
aa9b6c64d2 Merge pull request #9887 from farie82/Viral-injector 
Adds the viral injector as a job specific item for the virologist
 2018-10-21 18:31:49 +08: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
variableundefined
112f79b8b7 Merge pull request #9916 from SamHPurp/unused-atom-code 
Removing unused atom code
 2018-10-21 12:15:56 +08: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
variableundefined
3bd73279e7 No more bitshift 2018-10-21 09:10:50 +08: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
Crazy Lemon
517d7521b4 Merge pull request #9842 from variableundefined/ListFreeSlotNoLie 
Improve list free slots admin command
 2018-10-20 16:37:14 -07: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
Crazy Lemon
d843796448 Merge pull request #9839 from variableundefined/ReverseMedicalCyborg 
Fixes reversed medical cyborg hypospray log message
 2018-10-20 16:33:08 -07: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
Purpose
a3b7b3c8c0 this does nothing 2018-10-20 21:59:00 +01:00
farie82
2018da1b8f Sleepy me. Fixed now 2018-10-20 20:35:20 +02:00
joep van der velden
bbff7546d0 Fixed the weirdness 2018-10-20 18:58:42 +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
variableundefined
5b8f945956 Merge pull request #9906 from Birdtalon/spacepod 
Significantly reduces explosion from spacepods
 2018-10-20 18:59:03 +08:00
Birdtalon
8e0700f987 numbers round the wrong way 2018-10-20 11:05:53 +01: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
2cd94280ed Merge pull request #9908 from Fox-McCloud/gc-update 
Updates the Garbage SS
 2018-10-20 15:07:22 +08:00
variableundefined
82d00ca7f7 Merge pull request #9894 from craftxbox/patch-1 
add check to make sure person downloading pAI isnt dead.
 2018-10-20 12:56:46 +08:00
Fox McCloud
7d3be0e838 Updates the Garbage SS 2018-10-20 00:49:55 -04:00
craftxbox
2e8c655f67 add adjacent check too. 2018-10-20 01:56:21 -02:30
craftxbox
2a3e27e14d use better dead checking methods. 2018-10-20 01:56:01 -02:30
variableundefined
6d11c526a8 Merge pull request #9662 from dapocalypse/PasswordProtectedFiles 
Adds password protected files to modular computers.
 2018-10-20 11:01:35 +08:00
variableundefined
544e548f4e Merge pull request #9624 from alex-gh/unary_pipe_fix 
It is no longer possible to duplicate uvents.
 2018-10-20 08:37:53 +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