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
a65f8b690b
spacing
2018-11-28 19:38:09 -08:00
Kyep
b4acc30b2e
removes alignment system
2018-11-28 19:23:26 -08:00
Citinited
53300b82ea
Sticky tape crates have a small chance of spawning a rubber duck
2018-11-29 00:11:53 +00: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
variableundefined
0a7db4eca2
Merge pull request #10341 from datlo/deconstructguillotine
...
Make guillotines deconstructable
2018-11-26 17:50:53 +08:00
Kyep
41062f46ad
added hit sound for failed sanctified nullrod pickup
2018-11-25 16:56:38 -08:00
Citinited
fb15d92d57
Fixes issue with duct tape bypassing walls
2018-11-26 00:19:49 +00: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
variableundefined
d283cd1b4b
Merge pull request #10317 from datlo/advancedmimery
...
Adds the advanced mimery kit to mime uplink
2018-11-25 08:51:31 +08:00
datlo
9e7900d2c1
don't copy and pasta, kids
...
fixed spacing and unnessecary /the
2018-11-25 00:40:09 +00:00
variableundefined
24ace06513
Merge pull request #10324 from granodd/ReagentScannerUpgrade
...
The Old Mass Spectrometer is Dead, Long Live the Reagent Scanner
2018-11-25 08:38:29 +08:00
datlo
c22f2909c7
Make guillotines deconstructable
2018-11-25 00:26:54 +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
Fox McCloud
4969a03e94
Fixes and Updates CQC
2018-11-24 00:31:23 -05:00
Kyep
b139af2bdd
v1
2018-11-23 20:08:49 -08:00
Granodd
4b1ee1eeb6
Removing the mass spectrometer and replacing it with the reagent scanner.
2018-11-23 19:48:18 -05:00
AzuleUtama
ad03363936
stopped random potentially picking a discount after its been bought
...
Fixed a very unlikely to occur bug, also got rid of old code that served no purpose.
2018-11-23 21:37:28 +00:00
AzuleUtama
3bf5c482ce
Small changes and merged with master following some recent additions to uplink items
...
Keeping it updated alongside master.
2018-11-23 12:03:59 +00:00
AzuleUtama
c8fbdd4b42
Merge remote-tracking branch 'upstream/master' into discounts
2018-11-23 11:33:08 +00: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
80ddd0e8a3
Merge pull request #10303 from AzuleUtama/syndiecigsMaintloot
...
Add Syndicate Cigarettes to Maintenance Loot
2018-11-22 19:20:54 +08: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
AzuleUtama
9f0c127d9a
Add syndi cigs to maint loot
...
Since an item classed as legal can only be gotten on the uplink right now.
2018-11-21 11:21:24 +00:00
Darkmight9
50dbd49530
This, hopefully, gives overheal to nanopaste or at least can be a staging point. This is my fisr time coding so advice and impute is aprecated.
2018-11-21 01:20:32 -05:00
Michael C
bbba753001
Update boxes.dm
2018-11-20 21:04:49 -05:00
AzuleUtama
609d429233
Got things working properly... ish
2018-11-21 00:00:17 +00: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
alex-gh
7b2ad525e4
Fixes runtime in syndieteam radio.
2018-11-20 04:49:03 +01:00
AzuleUtama
2d6bb70729
Discounts!
...
LET'S GO SHOPPING!
2018-11-19 19:01:46 +00:00
variableundefined
a4b600407c
Merge pull request #10274 from Birdtalon/safepatch
...
Fixes safe runtime upon deletion
2018-11-19 22:43:09 +08:00
Birdtalon
b195aa5fa1
removes if statement adds return
2018-11-19 14:04:51 +00:00
variableundefined
765983a303
Merge pull request #10278 from KasparoVy/flame_on
...
Amends Plasma Statue Logging & Projectile Ignite Requirements
2018-11-19 15:42:06 +08:00
variableundefined
3f060e034e
Merge pull request #10253 from Kyep/cc_contraband
...
CC/Admin Outfits Update
2018-11-19 11:05:12 +08:00
KasparoVy
715286421a
Amends Plasma Statue Logging & Projectile Ignite Requirements
...
Can't ignite a statue with a disabler anymore.
Brings the logging on par with that of welding tanks.
2018-11-18 20:47:25 -05:00
