cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,364 Commits 26 Branches 2 Tags
90ff882149c5ce6872de5cd2b45708b6094183bf
Commit Graph

2495 Commits

Author SHA1 Message Date
Kyep
3fe6c8b019 switch to tg method, override /mob/dead/forceMove, revert all previous component changes 2018-11-22 18:26:36 -08:00
Kyep
49c3bb4a38 Fixes squeaking 2018-11-22 12:45:01 -08: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
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
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
tigercat2000
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
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
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
tigercat2000
32c5cb3bbe Merge remote-tracking branch 'upstream/master' into mechastuff 
# Conflicts:
#	icons/mob/screen_alert.dmi
 2018-11-04 10:52:50 -08: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
variableundefined
97fa69b02d Merge pull request #9986 from Dave-TH/access_tuner 
Access Tuner
 2018-11-04 12:27:16 +08:00
joep van der velden
abdb95a766 Sorts assassinate and ID theft 2018-11-03 23:52:08 +01:00
Kyep
1e38720413 WIP 2018-11-03 15:11:54 -07:00