Commit Graph

7530 Commits

Author SHA1 Message Date
variableundefined 3f060e034e Merge pull request #10253 from Kyep/cc_contraband
CC/Admin Outfits Update
2018-11-19 11:05:12 +08:00
alex-gh 45435169f5 Fixes anonymous syndicate borg radio. 2018-11-17 08:11:43 +01:00
Kyep d0a64445eb soup flasks 2018-11-16 09:34:57 -08:00
Kyep 070c349a81 fixes merge conflict in boxes.dm 2018-11-16 09:00:30 -08:00
Kyep 2063795224 revert/fix jacket, CC pinpointer, re-add dark lord, greytide toolbox 2018-11-16 08:47:45 -08:00
variableundefined 2f26dc1d11 Merge pull request #10242 from Certhic/radiochannels
refactor radio magic numbers
2018-11-16 23:51:53 +08:00
Certhic e3f852dff6 magic numbers 2018-11-16 15:32:49 +01:00
alex-gh d9383577f3 Fixes the passive effects of prayer beads and prayer bread. 2018-11-15 09:40:09 +01:00
alex-gh a96475e2c6 Fixes infinite roller beds for borgs. 2018-11-14 06:23:08 +01:00
Certhic 45506e6d19 runtime fix 2018-11-13 17:09:57 +01:00
craftxbox ec83e5c1f0 Update radio.dm 2018-11-12 12:19:36 -03:30
craftxbox 99de04db94 use human mob's voice instead of name. 2018-11-12 12:11:38 -03:30
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 c44b0fe732 gives a somewhat more reasonable integrity value to plastitanium windows 2018-11-09 17:23:11 +01:00
Eschess 098b0a25f4 gives fulltile plasma glass windows the same armor values as the directional version 2018-11-09 15:57:11 +01:00
Eschess 9013820a9d large boxes are actually bulky sized now 2018-11-09 15:50:58 +01:00
lass9030 c6af6f56f3 sheet hand icons from existing sprites 2018-11-09 15:21:45 +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
Kyep 07f5e956ac musician, ancient one, refactoring 2018-11-08 22:36:05 -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
Eschess a8f72ba436 a couple of fixes regarding reinfoerced plasma glass windows 2018-11-08 16:32:29 +01: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
warior4356 8012e0ac43 Tweaks made. 2018-11-07 16:04:18 -08:00
Spartan6 80e8b4ff19 Adds plastic bags and wet floor signs to loot maint 2018-11-07 00:52:36 +00: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 340046c8af Merge pull request #10134 from TDSSS/tranq-fix
Fixed tranquilite incorrectly being allowed in wall construction.
2018-11-06 21:30:25 +08:00
TDSSS a89cf91f82 now with 100% less snowflake 2018-11-06 11:42:01 +01: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
TDSSS a38af3281c Fixed tranquilite from being used in wall construction. 2018-11-05 20:26:56 +01:00
variableundefined 11536da564 Merge pull request #10108 from AzuleUtama/traitorRevisionsA
Traitor's toolbelt added, replaces military belt in traitor uplink
2018-11-05 22:11:46 +08:00