cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,640 Commits 26 Branches 2 Tags
9baf91fdfeaa7fc485bd29e9d8b9d5d0fbd2d0fb
Commit Graph

1846 Commits

Author SHA1 Message Date
variableundefined
c59b1d32a1 Merge pull request #9994 from Fox-McCloud/colorful-blood 
Colorful Reagent Changes Blood Color
 2018-10-28 08:42:07 +08:00
lass9030
45404f8b93 Runtimes, begone. 2018-10-27 16:16:38 +02:00
variableundefined
c373185e1e Revert "(TGCRP) - /tg/ catgirl refugee program" 2018-10-27 13:06:42 +08:00
variableundefined
bf7ef076ca Merge pull request #10000 from tigercat2000/literally_catgirls 
(TGCRP) - /tg/ catgirl refugee program
 2018-10-27 11:00:34 +08:00
Fox McCloud
23c9c43a96 Colorful Reagent Changes Blood Color 2018-10-26 20:56:00 -04:00
lass9030
ea4646e33d fixed it! 2018-10-26 17:50:06 +02:00
lass9030
29a73c7e47 get reagent amount 2018-10-26 11:43:32 +02:00
tigercat2000
1aa33c97ea Nyaaaaa~ 2018-10-25 19:59:30 -07:00
Aurorablade
654ed40fa8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-10-24 02:21:36 -04:00
tigercat2000
fb08ded489 Merge pull request #9934 from lass9030/reaction-scaling 
Reaction scaling
 2018-10-23 17:19:13 -07:00
variableundefined
9de64fa8c7 Better fix 2018-10-24 06:53:31 +08:00
variableundefined
b07dab729c Fix reagent dispenser getting attack cooldown 2018-10-23 21:54:46 +08:00
variableundefined
0ddd639bb2 Merge pull request #9938 from Fox-McCloud/destroy-reagents 
Helps Reagents GC Better
 2018-10-23 20:49:30 +08:00
Alonefromhell
8a023482a4 ++ =/= + 1 2018-10-22 14:38:40 +02:00
Fox McCloud
01fa39a5e6 Helps Reagents GC Better 2018-10-21 12:04:13 -04:00
lass9030
a7715c7d1f shock reach is now max 8 2018-10-21 16:28:42 +02:00
lass9030
90451e8a95 Maintains ratio of vortexes 2018-10-21 16:26:23 +02:00
lass9030
437d192d2f Revert electrocute_act 2018-10-21 16:21:52 +02:00
variableundefined
5c7867e3e1 Make oculine not expensive 2018-10-21 22:21:35 +08:00
lass9030
b6632428e0 actually closed min(). oops. 2018-10-21 14:42:00 +02:00
lass9030
283077dfc6 Merge branch 'master' into reaction-scaling 2018-10-21 14:36:32 +02:00
lass9030
2f2546e3c0 Cap it, instead of trying to do magic. 2018-10-21 14:33:28 +02:00
joep van der velden
decfcb91b2 Fixed it 2018-10-21 12:47:38 +02:00
variableundefined
aa9b6c64d2 Merge pull request #9887 from farie82/Viral-injector 
Adds the viral injector as a job specific item for the virologist
 2018-10-21 18:31:49 +08:00
variableundefined
600de8ba24 Deconflict 1 2018-10-21 07:56:55 +08:00
Crazy Lemon
d843796448 Merge pull request #9839 from variableundefined/ReverseMedicalCyborg 
Fixes reversed medical cyborg hypospray log message
 2018-10-20 16:33:08 -07:00
lass9030
17ecbdcfc5 removed FALSE 2018-10-20 23:43:13 +02:00
Desolate
91ae4713b8 removes mushroom changes 2018-10-20 16:34:24 -05:00
lass9030
bbdd501fe0 teslium and liquid dark matter 2018-10-20 22:56:29 +02:00
joep van der velden
bbff7546d0 Fixed the weirdness 2018-10-20 18:58:42 +02:00
Purpose
0fc81f51e4 corrections 2018-10-20 10:18:23 +01:00
farie82
0159d030b2 Merge branch 'master' into Viral-injector 2018-10-19 08:07:26 +02:00
Mark Mak
91dcf447ec Merge pull request #9888 from Fox-McCloud/spark-refactor 
Refactors Spark Spread Activation
 2018-10-19 08:41:03 +08:00
Mark Mak
4bc1a1c1ef Merge pull request #9363 from MarsM0nd/Refactor_UID 
Href refactor: macros and playerpanel
 2018-10-19 07:46:42 +08:00
joep van der velden
ede4477689 Added logging 2018-10-18 23:18:22 +02:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
joep van der velden
6d6c6bba9d Viromancy! 2018-10-17 20:18:55 +02:00
Fox McCloud
d219e2d86e Fixes Reagent Overdose Runtimes 2018-10-16 23:05:34 -04:00
variableundefined
2117cba7b5 Fixes reversed medical cyborg hypospray message 2018-10-13 23:19:32 +08:00
variableundefined
c2dff9ba01 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ContainerTypeRefactor 2018-10-13 19:16:41 +08:00
Mark Mak
21cae85a91 Merge pull request #9830 from Birdtalon/chem 
Small chem master icon fix/cleanup
 2018-10-13 09:02:25 +08:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
Birdtalon
98a084921f moves chem master to using update_icon() fixes not using no power sprites 2018-10-13 00:22:03 +01:00
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
Birdtalon
e9d153daf4 moves check and add to reagents holder datum 2018-10-12 15:59:30 +01:00
variableundefined
4de5284557 Merge pull request #9677 from DesolateG/global 
Updates global lists to the global var subsystem.
 2018-10-12 13:18:28 +08:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging 
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
 2018-10-09 10:06:03 +08:00
variableundefined
2ea037cc73 Merge pull request #9747 from SamHPurp/runtime-cheating 
Fixes Reagent Holder.dm Runtime, from cooking
 2018-10-09 08:27:04 +08:00