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

341 Commits

Author SHA1 Message Date
Fox McCloud
5b85c79b8f Merge pull request #13577 from trololiver112/Chef-can-buy-CQC 
Gives the Chef the CQC manual as a traitor item
 2020-07-07 13:49:52 -04:00
AffectedArc07
e305530d59 Obliterates Zombies 2020-07-02 21:22:55 +01:00
trololiver112
344226b2b4 Gives the Chef the CQC manual as a traitor item 2020-06-08 20:51:43 +02:00
AffectedArc07
928a8f0e04 Makes the code pass dreamchecker (#13161) 
* Initial Commit - Trying to add DC to Travis

* Forgot to chmod

* This took too long

* Farie Fixes

* Fixes new code

* Job factions are fucking smelly

* Loadouts work again

* Runtime fixes
 2020-04-11 15:59:16 -06:00
AzuleUtama
da0375028f Fixes incorrect description for Traitor's Meat Cleaver (#12397) 2019-09-23 15:25:53 -07:00
TDSSS
840559e9ae Buffs the uplink syringe gun, it now comes with some syringes (#12353) 2019-09-20 17:59:51 -07:00
Dave
8403104980 No I didn't use the web editor 2019-09-16 12:47:22 -04:00
Dave
eba05d3e91 Shield desc fix 2019-09-16 12:23:08 -04:00
AzuleUtama
c6d846b6b6 Nuclear Operative Item Tweaks 2019-09-11 21:25:44 +01:00
Fox McCloud
92f3edf853 tweaks to uplink 2019-09-11 01:20:30 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Fox McCloud
8b72c3b64a Fixes Romerol--Comments it Out Until Refactor 2019-09-03 23:16:32 -04:00
Coul
6b82bfe47d Merge remote-tracking branch 'upstream/master' into zombies 2019-09-03 15:52:43 -04:00
Coul
5045980323 review changes 2019-09-02 05:32:15 -04:00
variableundefined
97654f5d52 Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle 
Ports VG's false briefcase
 2019-08-26 08:53:14 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
Crazy Lemon
3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update 
Major Lavaland Update
 2019-08-16 22:22:49 -06:00
variableundefined
9097eb0e1d Merge pull request #11741 from AzuleUtama/chameleonGlasses 
Traitor thermals and security HUD now use updated chameleon code, Slight buff to the thermals
 2019-08-13 12:06:39 +08:00
AzuleUtama
f550b19f8d conflicts and reviews 2019-08-12 19:04:21 +01:00
AzuleUtama
f19e8aa58a conflicts 2019-08-12 18:47:11 +01:00
Fox McCloud
ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
Couls
6ee8c0d96f Merge remote-tracking branch 'upstream/master' into zombies 2019-08-04 21:05:10 -04:00
variableundefined
5c325d33fe Merge pull request #11684 from IAmBigCoat/medbeamwarnings 
Added warnings to the medbeam gun re: stream-crossing
 2019-07-12 18:17:07 +08:00
AzuleUtama
ab8c0f5aa5 Reverted compact rifle changes, false bottomed case now starts empty 2019-06-30 12:28:23 +01:00
AzuleUtama
fa2ca7c87c Ports VG false bottomed briefcase + compact sniper changes 2019-06-29 15:47:26 +01:00
AzuleUtama
9500df95d3 Traitor thermals and security HUD now use chameleon code 2019-06-22 14:06:07 +01:00
IAmBigCoat
f04a0a4c53 Added proposed uplink description change. 2019-06-05 17:07:09 -04:00
IAmBigCoat
8645a0b0ef Added warnings to the medbeam gun re: stream-crossing 2019-06-05 01:49:58 -04:00
AzuleUtama
bddc563343 Makes Cybernetic Bundles Nuke Ops Only Again 2019-05-26 02:24:44 +01:00
Couls
8083b51a96 Initial commit 2019-05-16 22:36:30 -04:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
variableundefined
5357e0e36f Merge pull request #11428 from Markolie/bundles 
Chameleon overhaul
 2019-05-04 08:23:40 +08:00
Mark van Alphen
bcc1bdc168 Remove jumpsuit from uplink 2019-05-03 18:27:57 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Mark van Alphen
0d73736be2 Make the traitor reviver implant EMP-proof 2019-05-01 02:34:16 +02:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
variableundefined
31a2779bae Merge pull request #11259 from Markolie/flukeops 
Nuke Ops updates and buffs
 2019-04-18 07:16:31 +08:00
Fox McCloud
e11b15fe7f Merge pull request #11270 from TDSSS/nukie-hijack 
Lets nukies buy plasmagrenades again (and other hijack gear)
 2019-04-09 22:47:26 -04:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc 
# Conflicts:
#	code/game/objects/items.dm
 2019-04-07 19:54:14 -04:00
TDSSS
106b242770 Let's fix that too 2019-04-07 23:19:11 +02:00
TDSSS
e12653306a Thought of a better way to do it (probably 2019-04-07 23:16:54 +02:00
TDSSS
6079cb1839 allows nukies to buy hijack items 2019-04-07 23:12:15 +02:00
Mark van Alphen
ddc3a02ab3 Fix thermal for saboteur, reinforcement bugfix, re-add C4 pack 2019-04-07 23:04:43 +02:00
Mark van Alphen
16dd2860f4 Remove debug and re-add spawning as a cyborg 2019-04-07 22:42:04 +02:00
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
variableundefined
996f26508e Merge pull request #11240 from Arkatos1/Carp_Change 
Changes Dehydrated Space Carp TC cost from 3 to 2
 2019-04-07 21:20:39 +08:00
variableundefined
53d64d818d Merge pull request #11225 from TDSSS/box-revolver 
Trick revolver comes in a box.
 2019-04-07 21:14:51 +08:00
Arkatos1
e290523290 Changes Dehydrated Carp TC cost from 3 to 2 2019-04-05 18:25:08 +02:00
variableundefined
cc831667cd Merge pull request #11081 from Kyep/hijack_limits 
Syndie Uplink changes (better interface, hijack-only firegrenades)
 2019-04-04 09:30:56 +08:00
TDSSS
2ba5ec0228 fake revolver kit creation 2019-04-03 20:43:55 +02:00