cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-15 03:52:43 +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
Mark van Alphen
f75de97c6e Port over Corn and affected's work on Lavaland 
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
 2019-04-01 23:41:32 +02:00
Fox McCloud
ce3d4789ad Merge pull request #11153 from farie82/spontaneous-comb-fix 
Spontaneous combustion now has a minimal stack of 1 it applies
 2019-04-01 17:27:29 -04:00
Fox McCloud
e487b8b58e gosh dang 2019-04-01 16:22:20 -04:00
Mark van Alphen
57366118af Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 2019-04-01 17:55:37 +02:00
variableundefined
b0f64016a9 Merge pull request #11158 from Fox-McCloud/delayed-gibbing 
Makes Delayed Gibbing a Proc
 2019-04-01 23:07:17 +08:00
Arkatos1
5bb8b5759e Added antag sounds themes when adding antags via traitor panel, added cult theme for new cult converts and added traitor/malf theme for autotraitored crew/ai 2019-04-01 02:46:48 +02:00
Mark van Alphen
ce434df396 Fix disease path 2019-04-01 00:47:28 +02:00
Mark van Alphen
ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Mark van Alphen
bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00
Mark van Alphen
a05b37c5ca General Lavaland fixes, add Hierophant ruin 2019-03-31 01:12:10 +01:00
Mark van Alphen
ceceb9f3b3 Largely finish up beach ruin 2019-03-31 00:20:27 +01:00
Mark van Alphen
45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen
f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Mark van Alphen
2047825165 Finish up Lavaland map 2019-03-30 21:08:33 +01:00
Arkatos1
8669ea1716 Removed Dark Matter for real, improved descriptions and added Blob Overminds to Check Antagonists verb 2019-03-30 15:00:12 +01:00
Fox McCloud
f70ecb4387 Adds Trick Revolver 2019-03-29 23:33:46 -04:00
Mark van Alphen
c370e08233 Port the actual Lavaland map (and associated fixes) 2019-03-30 04:12:37 +01:00
variableundefined
456320cbe0 Merge pull request #11144 from Fox-McCloud/chem-dispenser-refactor 
Chem Dispenser Refactor
 2019-03-29 20:28:14 +08:00
Fox McCloud
35758db699 Makes Delayed Gibbing a Proc 2019-03-28 20:34:20 -04:00
farie82
b228aab0cf Update fire.dm 2019-03-28 23:00:43 +01:00
Fox McCloud
a5403c192a fixed errors 2019-03-28 17:54:39 -04:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
joep van der velden
407f867b14 Min stacks now is 1 2019-03-28 10:12:32 +01:00
Fox McCloud
41c03e03d9 Chem Dispenser Refactor 2019-03-26 18:29:11 -04:00
joep van der velden
6025f402ce refactored hoodies to work without antidrop 2019-03-26 20:37:20 +01:00
variableundefined
be9a5906f2 Merge pull request #11095 from Fox-McCloud/new-gas 
Adds Unidentified Gas in Deep Space
 2019-03-24 17:57:53 +08:00
variableundefined
a34c8dda8f Merge pull request #11076 from AzuleUtama/syndieMedBagChanges 
Removes MMI from uplink surgery kit - makes it a separate purchase for Roboticists
 2019-03-24 17:47:02 +08:00
Fox McCloud
40466fc528 makes agent B not suck 2019-03-24 02:21:45 -04:00
variableundefined
1d7178bfeb Merge pull request #11088 from Kyep/do_you_want_to_play_as_question 
Fixes "Do you want to play as ?"
 2019-03-23 19:22:26 +08:00
Kyep
282dff2596 implements Dave's suggestion 2019-03-22 18:27:36 -07:00
Kyep
54ba0a7eea Fixes ? error 2019-03-21 06:51:28 -07:00
AzuleUtama
535a0bf84f oopsies i did a silly 2019-03-20 19:06:30 +00:00
Kyep
04f780fc4e cost 2019-03-19 09:50:09 -07:00
Kyep
b4ee075b39 makes syndi bomb not hijack only again 2019-03-19 09:48:34 -07:00
Kyep
5db5b3055b made hijack_only bomb/firegren nosurplus/nodiscount 2019-03-19 06:00:00 -07:00
Kyep
3559a77d0f Uplink improvements 2019-03-19 04:35:03 -07:00
AzuleUtama
29aa1ccef7 Removed MMI from surgery bag, made it Roboticist only 2019-03-18 20:22:38 +00:00
B.A.L
787dd510aa Adds plasmaman and Vox crates 2019-03-14 21:22:31 -07:00
variableundefined
62412c1611 Merge pull request #11006 from Kyep/mystery_antags 
Event Role Feature
 2019-03-09 22:17:05 +08:00
Kyep
57d9b22675 Eventmob/specialrole v1.0 2019-03-08 02:08:24 -08:00
AzuleUtama
a5cd29f17b Fixed two bugs with the cyber implant bundle, ammo bag and cyber bundle no longer discountable 2019-03-04 19:40:23 +00:00
Dave
ebe99e8986 Applies what my mom taught me about conflict resolution 2019-03-01 18:51:04 -05:00
variableundefined
d800523af3 Merge pull request #10941 from Fox-McCloud/virology-balance 
Re-Balances Virology
 2019-02-26 08:08:16 +08:00
variableundefined
33fbced3dc Merge pull request #10919 from Fox-McCloud/compact-sniper-rifle 
Adds Compact Sniper Rifle to Uplink
 2019-02-24 07:52:04 +08:00
Fox McCloud
182177f6eb grammar/wording 2019-02-23 18:17:21 -05:00
Fox McCloud
b9262b9766 tweak 2019-02-23 04:02:50 -05:00
Fox McCloud
97c9817d85 Re-Balances Virology 2019-02-22 18:49:16 -05:00
Fox McCloud
bb3f2266cf Adds Compact Sniper Rifle to Uplink 2019-02-17 03:32:10 -05:00
datlo
91792b09c1 Prevent objectives from targetting offstation roles 
also remove nukie flavor text and prevent golem targetting
 2019-02-16 15:09:25 +00:00