cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 13 Branches 2 Tags
dev-docs-readme
Commit Graph
4623 Commits
Author SHA1 Message Date
warior4356 9be0a83269 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill 2018-11-08 01:58:53 -08:00
tigercat2000andGitHub 97461b3f3d Merge pull request #10078 from variableundefined/FermentationBarrel 
[READY] Port Fel's fermentation barrel from tg
 2018-11-07 23:09:08 -08:00
AzuleUtama 429df67dd2 Fixes RCD giving no user feedback when out of ammo 
RCD will now give a low ammo error for what you are trying to build / destroy. Additionally gives errors when trying to build airlocks or windows over space tiles otherwise it would give a low ammo error when trying to do so.
 2018-11-06 19:38:34 +00:00
variableundefinedandGitHub 85443981bb Merge pull request #10128 from datlo/syndisuitinternals 
Adds internals to the syndicate spacesuit and hardsuit
 2018-11-06 17:36:00 +08:00
variableundefinedandGitHub 120b338d4d Merge pull request #10122 from TatsumakiMagi/rollie-changes 
Rollie changes, grammar fix and target icon update fix
 2018-11-06 07:31:02 +08:00
variableundefined b5425869da Most content fixed, except for blob act. 2018-11-05 21:33:42 +08:00
datlo c22304ddcb Added to hardsuit 
derp'd
 2018-11-05 08:15:24 +00:00
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
TatsumakiMagi adf142fe3d Updates rollie volume 100, processes all reagents, grammar correction, target icon update 2018-11-05 01:05:12 +00:00
AzuleUtama a700f1f52c Traitor's Toolbelt Added 
Added the belt as a variant of the military belt in the belts.dm.

Replaced the military belt in the uplink_item.dm with the new traitor's toolbelt. Price also lowered to 2TC since even with the change, it still feels pricey at that cost for what it offers.
 2018-11-04 13:30:10 +00:00
variableundefined 7544ae573f Add in squeak component and refactor mouse, bikehorn, clown suit to use it. 2018-11-04 14:17:45 +08:00
Kyep 1e38720413 WIP 2018-11-03 15:11:54 -07:00
variableundefinedandGitHub a741ff4961 Merge pull request #9949 from AffectedArc07/ghost-spawns 
Adds Space Ruins / Ghost Roles
 2018-11-02 08:12:01 +08:00
variableundefined 7905b64076 Port over fermentation barrel, minor refactor of reagent container, add in wine power etc. 2018-11-01 11:01:45 +08:00
warior4356 0ee51bdcc2 Reverts maps. Fixes conflict. 2018-10-31 19:13:22 -07:00
warior4356 9adcc85b3e Added Safe-cracking Kit 2018-10-29 03:52:21 -07:00
Squirgenheimer 687d2c8f0f changed number of mining satchel slots to 10 2018-10-29 05:17:50 -04:00
variableundefinedandGitHub 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
variableundefinedandGitHub c373185e1e Revert "(TGCRP) - /tg/ catgirl refugee program" 2018-10-27 13:06:42 +08:00
variableundefinedandGitHub bf7ef076ca Merge pull request #10000 from tigercat2000/literally_catgirls 
(TGCRP) - /tg/ catgirl refugee program
 2018-10-27 11:00:34 +08:00
variableundefinedandGitHub 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
Kyep c9f9aaa8ea item changes 2018-10-24 16:03:29 -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 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