cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-16 12:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,775 Commits 27 Branches 2 Tags
4cc30536605ba8dcafe31e6a9be9d0e40e6091c8
Commit Graph

3126 Commits

Author SHA1 Message Date
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
variableundefined
e03d3e4770 Merge pull request #10090 from farie82/Security-logs-fix 
Initializes the security comments on creation of the records + made a set criminal status helper
 2018-11-03 13:32:57 +08:00
Fox McCloud
ecb9c11433 Updates Components Again 2018-11-02 16:23:46 -04:00
tigercat2000
b370858fc8 Fixes Phazon movespeed, add radial menus to ctrl 
Ctrl Clicking on a mech while you're in it will now bring up a radial
weapon selection
 2018-11-02 00:46:08 -07:00
variableundefined
a741ff4961 Merge pull request #9949 from AffectedArc07/ghost-spawns 
Adds Space Ruins / Ghost Roles
 2018-11-02 08:12:01 +08:00
joep van der velden
7a95a919be Added the requests 2018-11-01 22:43:19 +01:00
tigercat2000
d6a852bcfa Merge remote-tracking branch 'upstream/master' into mechastuff 
# Conflicts:
#	code/game/mecha/mecha.dm
 2018-11-01 08:37:46 -07:00
joep van der velden
b553c3548a Fixed it + made a helper 2018-11-01 14:59:41 +01:00
warior4356
0ee51bdcc2 Reverts maps. Fixes conflict. 2018-10-31 19:13:22 -07:00
tigercat2000
6028fc83c3 Not quite done yet 2018-10-30 22:57:42 -07:00
variableundefined
ed30ce21fa Merge pull request #10029 from farie82/oil-dispenser 
Gives cargo the ability to buy an Oil tank.
 2018-10-30 20:55:14 +08:00
warior4356
9adcc85b3e Added Safe-cracking Kit 2018-10-29 03:52:21 -07:00
warior4356
13d927c10e Drills implimented 2018-10-29 01:10:10 -07:00
SomeSortaSquid
bfbd4213d3 Cleaned Up Airlock Remote Electrocution Fix 
Tested locally, works as expected.
Airlocks only electrocute people standing next to them.
 2018-10-28 15:04:52 +01:00
joep van der velden
61f931e7c6 Gives cargo IPC blood 2018-10-28 13:13:16 +01:00
SomeSortaSquid
679e3be82b Electrified Airlock Fix 
Previously electrified airlocks had no adjacency check, only UI.
This led to remote electrocutions.
 2018-10-28 11:24:56 +01:00
Dave
c78581d359 Access Tuner 2018-10-26 15:01:59 -04:00
joep van der velden
009fbd3b44 Fixed it 2018-10-25 16:55:23 +02:00
Kyep
c9f9aaa8ea item changes 2018-10-24 16:03:29 -07:00
AffectedArc07
dbfeba6d59 Merge branch 'space-ruin-number-one' of https://github.com/SamHPurp/Paradise into ghost-spawns 2018-10-22 20:39:31 +01:00