cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 13:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,145 Commits 26 Branches 2 Tags
5452d4e8df05abd2e19b8fc8474cf0a1bf345729
Commit Graph

1999 Commits

Author SHA1 Message Date
Mark van Alphen
6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
 2019-04-17 22:46:43 +02:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
Fox McCloud
964bf03697 icy floors 2019-04-13 04:44:25 -04:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Mark van Alphen
c597c9be51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
 2019-04-11 07:27:51 +02:00
Crazy Lemon
6c4eb66da8 Merge pull request #11282 from Fox-McCloud/atmos-defines 
Atmos Define Cleanup + Plasma Tweaks
 2019-04-10 22:18:52 -07:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Mark van Alphen
f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
 2019-04-10 21:54:54 +02:00
variableundefined
c6b8daa9b1 Merge pull request #11227 from Fox-McCloud/sr-update 
Minor Strange Reagent Tweaks
 2019-04-10 10:47:40 +08:00
variableundefined
aee2f6772e Merge pull request #11217 from Fox-McCloud/reagent-bodytemp 
Tweaks Reagent Bodytemp Interaction
 2019-04-10 10:42:31 +08:00
Fox McCloud
42a6f4ef30 tweak 2019-04-09 11:32:21 -04:00
variableundefined
ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks 
[Goonchem] Reagent tweaks
 2019-04-07 21:22:18 +08:00
Fox McCloud
8e0f0906a3 Merge remote-tracking branch 'upstream/master' into sr-update 2019-04-06 19:58:12 -04:00
Crazy Lemon
f6227ab2f8 Merge pull request #11223 from Fox-McCloud/fix-teslium 
Fixes Teslium Being Unmakeable
 2019-04-06 00:25:56 -07:00
Fox McCloud
7d5e09d97d Fixes Reagents Not Updating 2019-04-05 02:22:10 -04:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Fox McCloud
43355ca694 tweak 2019-04-04 05:16:42 -04:00
Fox McCloud
282350fb71 Tweaks Foam and Pyrotechnics 2019-04-04 05:06:39 -04:00
Fox McCloud
7455ca11d1 Minor Strange Reagent Tweaks 2019-04-03 23:03:20 -04:00
Fox McCloud
9929a9468d Fixes Teslium Being Unmakeable 2019-04-03 13:37:16 -04:00
Mark van Alphen
19b923c999 Ash Walker/Gutlunch fixes. Glass containers now do not splash on help intent, for milking. 2019-04-03 17:24:55 +02:00
Fox McCloud
6710530450 Tweaks Reagent Bodytemp Interaction 2019-04-02 23:40:55 -04:00
variableundefined
a552137e07 Merge pull request #11190 from Fox-McCloud/flash-sonic-bang 
Flash Powder, Sonic Powder, and Flashbang Refactor
 2019-04-02 20:33:17 +08:00
variableundefined
bb14880f66 Merge pull request #11198 from Fox-McCloud/Ohhhhhhhhhhhhhh-sssssshiiittttt-antttttssssss 
OHHHH SHITTTT ANTTTSSS
 2019-04-02 18:26:26 +08:00
Mark van Alphen
500675be77 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/structures/safe.dm
 2019-04-02 00:54:49 +02:00
Fox McCloud
2bbba89480 Merge pull request #11169 from Arkatos1/Blob_QoL_Update 
Blob QoL Update and Rebalance
 2019-04-01 18:11:37 -04:00
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
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
variableundefined
06a9770ae4 Merge pull request #11157 from Fox-McCloud/chem-master-refactor 
ChemMaster Refactor
 2019-04-01 23:06:42 +08:00
Fox McCloud
6fadf083d7 OHHHH SHITTTT ANTTTSSS 2019-04-01 01:27:49 -04: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
Fox McCloud
ac78e8479e abstract camera mobs 2019-03-31 03:48:47 -04:00
Fox McCloud
cbcc4aab45 Flash Powder, Sonic Powder, and Flashbang Refactor 2019-03-31 03:29:27 -04:00
Mark van Alphen
ceceb9f3b3 Largely finish up beach ruin 2019-03-31 00:20:27 +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
Arkatos1
a22d31f350 Complete Blob UI, Blob mobs now use complementary colors, special blob tiles refund, node requirement verb, minor refactors, remove shortcut improvement, dark matter removed from blob reagents, custom icons 2019-03-30 02:16:30 +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
variableundefined
95982791c0 Merge pull request #11130 from Arkatos1/Blob_UI 
New Blob UI! [TG Port]
 2019-03-29 19:22:15 +08:00
Fox McCloud
35758db699 Makes Delayed Gibbing a Proc 2019-03-28 20:34:20 -04:00
Fox McCloud
be1a2b4452 ChemMaster Refactor 2019-03-28 19:41:17 -04:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Arkatos1
095b1c25ea Code improvement 2019-03-27 15:22:09 +01:00
Fox McCloud
f00596fe81 oops 2019-03-26 18:54:28 -04:00
Fox McCloud
41c03e03d9 Chem Dispenser Refactor 2019-03-26 18:29:11 -04:00
Arkatos1
ea2cc23111 Added reagent description when blob does chemical reroll, adds complementary color to all reagents, marker now uses complementary colors of reagents, minor formatting 2019-03-26 20:51:06 +01:00
Arkatos1
c0b5359cbd Added descriptions to all blob reagents, and added them to the Blob Help. Reorganized Blob Help a little. 2019-03-26 18:38:09 +01:00
Fox McCloud
ae7a141d28 fixes smoke 2019-03-24 18:44:01 -04:00
Fox McCloud
dd3d32d897 Reagent Garbage Collection Edge Case 2019-03-24 16:32:10 -04:00