Commit Graph

3142 Commits

Author SHA1 Message Date
variableundefined c011c0ad2f Merge pull request #10441 from datlo/boxsprites
Add sprites to specie specific boxes
2018-12-15 18:15:52 +08:00
variableundefined 0c134f19b8 Merge pull request #10389 from Edefff/Fix-cigarette-chem-consumption
Fix cigarette chem consumption
2018-12-13 23:08:54 +08:00
variableundefined 16a064d1e6 Merge pull request #10422 from Kyep/depot_update_4
Depot Update
2018-12-13 23:06:29 +08:00
variableundefined 3571c7d157 Merge pull request #10424 from Mitchs98/sushi
Adds Sushi Mat and Sushi Makiroll
2018-12-13 23:01:06 +08:00
variableundefined 07769ba3b9 Merge pull request #10438 from Aurorablade/BirdisnotbirdisnotBIRD
Trying to Diagnose rsc issues
2018-12-12 13:28:55 +08:00
datlo 5651009eb5 add sprites to specie specific boxes 2018-12-11 14:48:55 +00:00
variableundefined 7d33a49a30 Merge pull request #10433 from Kyep/singulo_warning
Clarifies BoH/BoH warning
2018-12-11 20:38:59 +08:00
variableundefined 9e59827416 Merge pull request #10351 from Citinited/duct-tape-stick-tweak
You can stick duct tape to more than just paper now
2018-12-11 20:18:05 +08:00
variableundefined a5d44ef87e Merge pull request #10322 from Birdtalon/speciesboxes
Speciesboxes; species specific starting boxes
2018-12-11 19:57:30 +08:00
Aurorablade 87f3a7c1b3 Caseing 2018-12-10 21:52:10 -05:00
Kyep e204fd6638 Clarifies BoH/BoH warning 2018-12-08 19:44:28 -08:00
Mitchell 242ef496cf Removed extra comma. 2018-12-07 16:24:54 -06:00
Mitchell 54c4325c46 Adds Sushi Mat and Sushi Makiroll
Makes sushi 100% more efficient and viable to make a restaurant out of.
2018-12-07 13:28:10 -06:00
Kyep 0d91b3b619 deletes trapped syndi toolbox 2018-12-06 19:13:56 -08:00
Edefff fdf6f521d6 Fix cigarette chem consumption
https://github.com/ParadiseSS13/Paradise/pull/10122 attempted to fix rollies by transferring .4u of each chem present in them instead of .4u shared between all chems. Prior to this, if a chem took up less than 25% of the chem volume, the user would not metabolize any as they would receive less than .1u of the chem, and amounts less than .1 are ignored.

However, that change caused all cigarettes to burn through their chems at a much faster rate than normal if they had more than one chem inside them. A full cigarette with 2 chems inside it would run out twice as fast, and 3 chems three times as fast, and so on. This means Syndicate cigarettes, for example, now last half as long.

This commit fixes the original problem whilst still maintaining the original chem rate. It still transfers .4u split between all chems, however if a chem doesn't take up enough of the total volume to transfer at least .1u, it will bump the amount to .1, ensuring each chem will be metabolized.

This also fixes the rollie smoketime to be in line with the new chem volume. The new value is 100 / .4u = 250. The old value, even without the above changes, meant that the rollie would burn out before delivering all of it's volume if it only had one chem in it.
2018-11-30 20:57:34 -08:00
Citinited 6354631937 Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted 2018-12-01 00:13:21 +00:00
variableundefined 00a0acb2ec Merge pull request #10340 from Kyep/chaplain_1
Chaplain tweaks
2018-11-29 14:22:03 +08:00
Kyep b4acc30b2e removes alignment system 2018-11-28 19:23:26 -08:00
Citinited 88ff4eb49f Some fixes for taping, also bumps up max_amount for tape rolls and adds a tape supply pack 2018-11-28 22:21:59 +00:00
variableundefined 63490c8378 Merge pull request #10330 from tigercat2000/multilingual
Multilingualism
2018-11-28 10:48:19 +08:00
Kyep c5a4abeb8b changes alignments to light/neutral/dark, removes atheism 2018-11-27 17:34:10 -08:00
Birdtalon b5e506d40c adds species starting boxes 2018-11-27 12:42:43 +00:00
Kyep 4d5d97024b removes unnecessary spawn() 2018-11-26 15:29:44 -08:00
Kyep 032a8e00a5 sanctified nullrod hallelujah on pickup, once 2018-11-26 14:04:12 -08:00
Kyep 41062f46ad added hit sound for failed sanctified nullrod pickup 2018-11-25 16:56:38 -08:00
Kyep a8ce5cdc2a adds sanctified red/gamma ERT nullrods 2018-11-25 16:18:32 -08:00
Kyep 77c244a91e fixes more cases of code snowflake 2018-11-25 15:32:07 -08:00
Citinited 05b9955f2b You can stick duct tape to more than just paper now 2018-11-25 23:03:10 +00:00
Kyep b50016891e removes all spells but bless, fixes bugs, adds holy torch 2018-11-24 14:07:21 -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
Kyep b139af2bdd v1 2018-11-23 20:08:49 -08:00
datlo eeb447d424 spelling
oof
2018-11-23 08:06:04 +00:00
datlo a80efa4924 Add the advanced mimery kit to mime uplinks
Also adds :
Mime specific spellbooks
TG wizard forcewall (mime is a subtype, will implement for wiz later
probably)
Fake finger gun spellbook in arcade
2018-11-23 07:23:34 +00:00
variableundefined b2ce6e5829 Merge pull request #10300 from AlAtEX/IPC-repair
Adds a Medkit for IPCs
2018-11-22 11:53:11 +08:00
variableundefined 214cf7b12e Merge pull request #10288 from datlo/basicsofCQC
Snake, try to remember some of the basics of CQC.
2018-11-22 08:53:26 +08:00
AlAtEx e6740168d9 Added machine first aid kit code 2018-11-21 18:14:40 -05:00
AlAtEx c2be8936eb Revert 2018-11-21 15:59:39 -05:00
Michael C bbba753001 Update boxes.dm 2018-11-20 21:04:49 -05:00
Fox McCloud fca03ff254 Merge pull request #10032 from variableundefined/SqueakComponent
Add in squeak component & refactor bikehorn, mouse to use it.
2018-11-20 18:38:42 -05:00
datlo 65286d7830 Adds the CQC manual to nukie uplinks 2018-11-20 03:51:52 +00:00
Kyep d0a64445eb soup flasks 2018-11-16 09:34:57 -08:00
Kyep 070c349a81 fixes merge conflict in boxes.dm 2018-11-16 09:00:30 -08:00
Kyep 2063795224 revert/fix jacket, CC pinpointer, re-add dark lord, greytide toolbox 2018-11-16 08:47:45 -08:00
alex-gh d9383577f3 Fixes the passive effects of prayer beads and prayer bread. 2018-11-15 09:40:09 +01:00
variableundefined 5c72537d8c Fixes merge conflicts 2018-11-14 09:21:21 +08:00
Certhic 45506e6d19 runtime fix 2018-11-13 17:09:57 +01: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
variableundefined 5a62f8ac07 Merge pull request #10179 from Eniraz/fulltile-plasma-windows-and-large-boxes
Fulltile plasma windows and large boxes
2018-11-11 15:09:35 +08:00
variableundefined 6f4be29ff0 Merge pull request #10190 from AzuleUtama/cyborgStunBaton
Fixed Borgs being able to continually use batons when out of power
2018-11-11 15:08:05 +08:00
variableundefined 6105639f69 Merge pull request #10166 from tigercat2000/updateicons
/tg/ human update_icons & ear organs
2018-11-11 12:09:30 +08:00