Commit Graph

2508 Commits

Author SHA1 Message Date
variableundefined
56ec930ef1 Merge pull request #10335 from datlo/powerbeaconbuff
Reduce power beacon cost to 10 and make it hijack only
2018-11-26 08:18:26 +08:00
datlo
2c3541b95f Fix a couple of finger gun issues 2018-11-25 19:04:53 +00:00
variableundefined
d283cd1b4b Merge pull request #10317 from datlo/advancedmimery
Adds the advanced mimery kit to mime uplink
2018-11-25 08:51:31 +08:00
datlo
0894cb9aa9 Reduce power beacon cost to 10 and make it hijack only 2018-11-24 17:28:42 +00:00
AzuleUtama
f154318946 Added alternate game log should the item have limited stock
Also via request of spartan
2018-11-24 16:41:42 +00:00
datlo
aca8b5ca0f changes vow of silence/spell adding checks 2018-11-24 16:08:47 +00:00
AzuleUtama
8747dc9d43 Hotfix for discounts to blacklist all job gear
On spartan's request
2018-11-24 14:20:36 +00: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
variableundefined
b2ce6e5829 Merge pull request #10300 from AlAtEX/IPC-repair
Adds a Medkit for IPCs
2018-11-22 11:53:11 +08:00
variableundefined
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
variableundefined
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 McCloud
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
variableundefined
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
variableundefined
6fea41482f Merge pull request #10157 from TDSSS/ai-quarantine
Make quarantine its own lawset.
2018-11-10 11:40:19 +08:00
TDSSS
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
TDSSS
20573bbdc7 made station not capitalized, removed reference to Command. 2018-11-08 19:56:29 +01:00
TDSSS
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
variableundefined
6c382bc854 Merge pull request #10147 from Spartan6/morelootmaint
The Revival of the Plastic Bag
2018-11-08 14:14:53 +08:00
variableundefined
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