cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 21:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,834 Commits 26 Branches 2 Tags
f48e016e8d64bc0148c8c71aa8ea26e97bfebd74
Commit Graph

3058 Commits

Author SHA1 Message Date
datlo
f48e016e8d Adds syndicate themed internals to the syndi spacesuit box. 
Buff the syndicate spacesuit by adding a syndicate mask and a dark
extended emergency oxygen tank to the syndicate spacesuit box. This
makes it easier for perma'd traitors with an uplink/storage implant to
escape, allow to carry a full EVA package in a single convenient box,
and make it easier for a spaced traitor to fix his situation.

Uplink description updated to reflect the change.
 2018-11-05 08:10:46 +00:00
variableundefined
a741ff4961 Merge pull request #9949 from AffectedArc07/ghost-spawns 
Adds Space Ruins / Ghost Roles
 2018-11-02 08:12:01 +08:00
Squirgenheimer
687d2c8f0f changed number of mining satchel slots to 10 2018-10-29 05:17:50 -04:00
variableundefined
6bece25226 Merge pull request #10008 from Normalyman/Test 
Dragging won't open containers while incapacitated
 2018-10-28 08:40:37 +08:00
Normalyman
3d1111ddaf Requested Change 2018-10-27 19:54:06 +02:00
Aurorablade
d9e3693caf It wwasn't checking for /airlock 2018-10-27 13:28:51 -04:00
Normalyman
b81e43ab53 Fix for issue #7950 2018-10-27 13:49:10 +02:00
variableundefined
c373185e1e Revert "(TGCRP) - /tg/ catgirl refugee program" 2018-10-27 13:06:42 +08:00
variableundefined
bf7ef076ca Merge pull request #10000 from tigercat2000/literally_catgirls 
(TGCRP) - /tg/ catgirl refugee program
 2018-10-27 11:00:34 +08:00
variableundefined
b6a9db1630 Merge pull request #9928 from tigercat2000/SPIN_ME_RIGHT_ROUND 
Radial Menu Port & RCD Refactor-Upgrade
 2018-10-27 10:52:43 +08:00
lass9030
cc40a25ce5 Prevents the lighting message showing incorrectly 2018-10-26 23:57:13 +02:00
lass9030
b1427fadc2 implied vars 2018-10-26 23:23:26 +02:00
lass9030
e2124db38b container type = injectable 2018-10-26 23:16:47 +02:00
tigercat2000
1aa33c97ea Nyaaaaa~ 2018-10-25 19:59:30 -07:00
Mitchell
47fa8e894d Fixes #9951, RPD Pipes Not Orientating. 
Fixes certain RPD Pipes not Orientating correctly on Orientate Automatically.
 2018-10-25 20:23:35 -05:00
Aurorablade
1baf06f66a removes one the leavesanother 2018-10-25 03:46:42 -04:00
Aurorablade
4426834521 HOTFIX 2018-10-25 03:17:50 -04:00
tigercat2000
64ea56f025 Merge remote-tracking branch 'upstream/master' into SPIN_ME_RIGHT_ROUND 
# Conflicts:
#	paradise.dme
 2018-10-24 23:43:25 -07:00
Aurorablade
654ed40fa8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-10-24 02:21:36 -04:00
tigercat2000
720bc1da8b Merge remote-tracking branch 'upstream/master' into SPIN_ME_RIGHT_ROUND 2018-10-21 11:46:39 -07:00
Purpose
2ebf971806 resolved icon conflicts 2018-10-21 11:46:39 +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
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
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
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 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
Purpose
621a2a7f9d bed time 2018-10-15 00:47:13 +01:00
Purpose
d11a0ac95b visibility 2018-10-14 11:52:09 +01: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