cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,217 Commits 29 Branches 2 Tags
b195aa5fa166fd4ce9e6acdefdff32f686b7cbe3
Commit Graph

3093 Commits

Author SHA1 Message Date
alex-gh
d9383577f3 Fixes the passive effects of prayer beads and prayer bread. 2018-11-15 09:40:09 +01:00
Certhic
45506e6d19 runtime fix 2018-11-13 17:09:57 +01:00
AzuleUtama
8ad25400ea Fixes description text errors in booger cocktail and in feral cat grenade 
Slightly changed text of booger cocktail's description to stop it creating a hyperlink in the chat window that went nowhere.  Updated feral cat grenades stating they spawned 8 cats in the uplink and item description when they actually spawn 5.
 2018-11-11 19:13:53 +00:00
variableundefined
5a62f8ac07 Merge pull request #10179 from Eniraz/fulltile-plasma-windows-and-large-boxes 
Fulltile plasma windows and large boxes
 2018-11-11 15:09:35 +08:00
variableundefined
6f4be29ff0 Merge pull request #10190 from AzuleUtama/cyborgStunBaton 
Fixed Borgs being able to continually use batons when out of power
 2018-11-11 15:08:05 +08:00
variableundefined
6105639f69 Merge pull request #10166 from tigercat2000/updateicons 
/tg/ human update_icons & ear organs
 2018-11-11 12:09:30 +08:00
AzuleUtama
df053924f1 Removed a pointless return 
Put a unique examine text for borgs in its place as originally intended.
 2018-11-11 01:55:03 +00:00
tigercat2000
02281c826f Merge pull request #10177 from farie82/boxes 
Added new box sprites props to Shazbot for the sprites
 2018-11-10 12:43:29 -08:00
AzuleUtama
ed7477c37e Fixed Borgs being able to continually use batons when out of power 
Borgs will now have their batons deactivate when they are too lower on power and cannot turn it back on until they recharge. Also removed the charge percentage examine text when using a baton as a borg otherwise it would always tell you it was 100% charged.
 2018-11-10 14:08:32 +00:00
joep van der velden
202ba8b5ed Forgot ERT, moved the boxes to boxes.dm 2018-11-10 12:08:06 +01:00
variableundefined
6fea41482f Merge pull request #10157 from TDSSS/ai-quarantine 
Make quarantine its own lawset.
 2018-11-10 11:40:19 +08:00
joep van der velden
172102a51a Added new box sprites 
Props to Shazbot for the sprites
 2018-11-09 19:33:35 +01:00
Eschess
9013820a9d large boxes are actually bulky sized now 2018-11-09 15:50:58 +01:00
variableundefined
3e16ee5605 Merge pull request #10163 from Mitchs98/implantfix 
Fixes Chemical Implants/Allows Injections
 2018-11-09 18:57:33 +08:00
variableundefined
a03d0323ed Merge pull request #10046 from warior4356/Drill 
Thermal Drill
 2018-11-09 17:11:36 +08:00
tigercat2000
4e181f2f1d Merge pull request #10144 from AzuleUtama/RCDFixes 
[WIP] Fixes RCD giving no user feedback when out of ammo
 2018-11-08 23:56:40 -08:00
Mitchell
8f4a7890c9 Adds to implantcase.dm instead. 2018-11-08 23:19:35 -06:00
tigercat2000
e5d1ecb6a4 Merge remote-tracking branch 'upstream/master' into updateicons 2018-11-08 20:24:48 -08:00
tigercat2000
ab032b6737 SSoverlays for human icons, mostly works 
Closer to working 100%

But legitimately /tg/ icons

Move lighting to it's own plane, fix observers

Fix humans layering over other objects incorrectly

Nyaaaaa~
 2018-11-08 20:24:22 -08:00
Mitchell
8a39134e53 Fixes #10161 2018-11-08 15:17:03 -06:00
AzuleUtama
e41da781f4 Removed else statements, improved code in general 
As per requested.
 2018-11-08 20:54:33 +00:00
TDSSS
bde2d90f7c remove commented out old quarantine module 2018-11-08 11:22:53 +01:00
TDSSS
e9c547f6ef Fixed oversight 2018-11-08 11:11:52 +01:00
TDSSS
e1062f04fd quarantine switched to own lawset 2018-11-08 11:00:45 +01:00
warior4356
9be0a83269 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill 2018-11-08 01:58:53 -08:00
tigercat2000
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
variableundefined
85443981bb Merge pull request #10128 from datlo/syndisuitinternals 
Adds internals to the syndicate spacesuit and hardsuit
 2018-11-06 17:36:00 +08:00
variableundefined
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
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
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
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