Commit Graph

1857 Commits

Author SHA1 Message Date
variableundefined
63490c8378 Merge pull request #10330 from tigercat2000/multilingual
Multilingualism
2018-11-28 10:48:19 +08:00
tigercat2000
e56750481c Multilingualism
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
2018-11-24 00:22:05 -08:00
Granodd
4b1ee1eeb6 Removing the mass spectrometer and replacing it with the reagent scanner. 2018-11-23 19:48:18 -05:00
variableundefined
a675406ebc Merge pull request #10194 from CornMyCob/pda-painter-wrench
Makes a few more machines movable
2018-11-12 08:44:05 +08: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
CornMyCob
44b8cdcd45 Adds a lot of other machines 2018-11-10 19:22:23 +00:00
tigercat2000
e5d1ecb6a4 Merge remote-tracking branch 'upstream/master' into updateicons 2018-11-08 20:24:48 -08:00
tigercat2000
ab032b6737 SSoverlays for human icons, mostly works
Closer to working 100%

But legitimately /tg/ icons

Move lighting to it's own plane, fix observers

Fix humans layering over other objects incorrectly

Nyaaaaa~
2018-11-08 20:24:22 -08:00
tigercat2000
97461b3f3d Merge pull request #10078 from variableundefined/FermentationBarrel
[READY] Port Fel's fermentation barrel from tg
2018-11-07 23:09:08 -08:00
variableundefined
7905b64076 Port over fermentation barrel, minor refactor of reagent container, add in wine power etc. 2018-11-01 11:01:45 +08:00
Arkatos1
9aed1d6697 Fixes Rewriter drink description typo 2018-10-31 14:23:04 +01:00
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