Commit Graph
4852 Commits
Author SHA1 Message Date
Kyep b139af2bdd v1 2018-11-23 20:08:49 -08:00
AzuleUtama 3c1c251fd3 discount gear now can't be picked in surplus crates 2018-11-23 23:01:12 +00:00
AzuleUtama 3bf5c482ce Small changes and merged with master following some recent additions to uplink items
Keeping it updated alongside master.
2018-11-23 12:03:59 +00:00
AzuleUtama c8fbdd4b42 Merge remote-tracking branch 'upstream/master' into discounts 2018-11-23 11:33:08 +00:00
datlo eeb447d424 spelling
oof
2018-11-23 08:06:04 +00:00
datlo b94beb061a divided mime.dm 2018-11-23 07:47:35 +00:00
datlo a80efa4924 Add the advanced mimery kit to mime uplinks
Also adds :
Mime specific spellbooks
TG wizard forcewall (mime is a subtype, will implement for wiz later
probably)
Fake finger gun spellbook in arcade
2018-11-23 07:23:34 +00:00
variableundefinedandGitHub b2ce6e5829 Merge pull request #10300 from AlAtEX/IPC-repair
Adds a Medkit for IPCs
2018-11-22 11:53:11 +08:00
variableundefinedandGitHub 214cf7b12e Merge pull request #10288 from datlo/basicsofCQC
Snake, try to remember some of the basics of CQC.
2018-11-22 08:53:26 +08:00
variableundefinedandGitHub 4a01a631f4 Merge pull request #10297 from Kyep/adm_fixes
Adds Hellhound, minor outfit tweaks
2018-11-22 08:24:18 +08:00
AlAtEx 7e0c1862b5 Added machine first aid kits to cargo order under medical 2018-11-21 18:15:05 -05:00
datlo f1ada4fefa big commit changes in desc
Added missing spacings
Added attack logging
Raised cost to 9 TC, made it tator and nukies, added to surplus, allowed
nukies to have gloves of north star, and updated description
Added a check preventing usage of CQC with gloves of north star
Fix a bug where attacks would not go through if a combo was done but the
target was critically injured (regular attacks now done instead)
Changed disarm logic, now always hits for 5 damage and use regular
disarm logic for disarming/pushing
Replaced "Big Bossed" attack verb by "neck chopped" and "gut punched"
because nofunallowed
2018-11-21 17:18:32 +00:00
AzuleUtama 609d429233 Got things working properly... ish 2018-11-21 00:00:17 +00:00
Fox McCloudandGitHub fca03ff254 Merge pull request #10032 from variableundefined/SqueakComponent
Add in squeak component & refactor bikehorn, mouse to use it.
2018-11-20 18:38:42 -05:00
Kyep 39b6725555 hellhound + minor tweaks 2018-11-20 15:19:19 -08:00
variableundefined 842b487980 Add disposing signal listening 2018-11-21 07:19:11 +08:00
datlo 65286d7830 Adds the CQC manual to nukie uplinks 2018-11-20 03:51:52 +00:00
AzuleUtama 2d6bb70729 Discounts!
LET'S GO SHOPPING!
2018-11-19 19:01:46 +00:00
B.A.L 61c2585ac3 Requested edits 2018-11-18 22:52:38 -07:00
B.A.L 4102faf1d6 Refunds and text warning 2018-11-18 22:34:54 -07:00
variableundefinedandGitHub 4fb0652741 Merge pull request #10263 from Quantum-M/damnCarp
Vampires and Changelings are no longer able to use sleeping carp.
2018-11-19 13:06:35 +08:00
Kyep 018519044f deletes unathi breacher 2018-11-18 16:56:29 -08:00
Kyep 1c8542414d ancient vampire raise vampires/shapeshift 2018-11-18 16:54:26 -08:00
B.A.L 00c8f5bd07 Item restriction and uplink description 2018-11-17 21:47:45 -07:00
Kyep b7c613f76c gives NTUO centcom access, fixes typo in access.dm, adds mindshield to specops arm implant 2018-11-17 17:28:31 -08:00
Kyep ec5503a2d5 no more soup 2018-11-16 09:59:04 -08: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 5c72537d8c Fixes merge conflicts 2018-11-14 09:21:21 +08:00
variableundefined 9e5a6698ad Restore original TG cooldown behavior 2018-11-13 09:15:17 +08:00
datlo 57ca69968d Prevent wizard from rodding out of the wizard den 2018-11-13 01:13:01 +00: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
variableundefinedandGitHub 6fea41482f Merge pull request #10157 from TDSSS/ai-quarantine
Make quarantine its own lawset.
2018-11-10 11:40:19 +08:00
TDSSSandGitHub 8c6375b325 revive -> undo necessary harm 2018-11-09 11:06:38 +01:00
Kyep 07f5e956ac musician, ancient one, refactoring 2018-11-08 22:36:05 -08:00
TDSSSandGitHub 20573bbdc7 made station not capitalized, removed reference to Command. 2018-11-08 19:56:29 +01:00
TDSSSandGitHub 372f80fce1 NT -> Nanotrasen 2018-11-08 12:34:34 +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
variableundefinedandGitHub 6c382bc854 Merge pull request #10147 from Spartan6/morelootmaint
The Revival of the Plastic Bag
2018-11-08 14:14:53 +08:00
variableundefinedandGitHub 1a388848bf Merge pull request #10074 from tigercat2000/mechastuff
/tg/ Mecha - Part 2, Action Buttons!
2018-11-08 13:12:41 +08:00
warior4356 8012e0ac43 Tweaks made. 2018-11-07 16:04:18 -08:00
tigercat2000andGitHub 6d3262bf27 Merge pull request #10104 from farie82/Sort-lists
Sorts selection lists like assassinate targets
2018-11-07 09:23:57 -08:00
joep van der velden 7ac1ddbabe Fixed it. SortNames sucks sortAtom rocks 2018-11-07 17:43:12 +01:00
Spartan6 e6fcd8ce21 Adds plastic bag to badass uplink 2018-11-07 01:10:48 +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
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