Commit Graph

415 Commits

Author SHA1 Message Date
LetterJay
d2607c0654 Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639
[MIRROR] Refactors anti-magic into a component
2018-02-25 16:59:38 -06:00
deathride58
621090d54d Merge pull request #5707 from Citadel-Station-13/upstream-merge-35840
[MIRROR] Removes liver unfailure and makes alcohol do the killing thing sometimes
2018-02-25 21:42:21 +00:00
BordListian
a75ac3bc13 Removes liver unfailure and makes alcohol do the killing thing sometimes (#35840)
* - Removes liver unfailure

* - MY LIVER FAILED INSTANTLY

* - Increases liver damage tenfold because whats the point of this pr if you need to drink 100 liters of the toughest booze in the game before you get liver damage

* - Fixes cyber livers not being twice as durable as ordinary livers
- Ok compromise alcohol does twice as much liver damage
- Fixes livers regenerating after they failed

* - I'll be happy if bacchus blessing destroys my liver and absinthe doesn't

* - I think this is the final number I'll punch in. I downed 14 shot glasses of vodka
2018-02-25 14:52:53 -06:00
XDTM
493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00
YPOQ
4257c9ff5a Fixes gold slime extract reactions runtime (#35936) 2018-02-24 22:01:04 -06:00
CitadelStationBot
58413c4b54 [MIRROR] Renames various reagent IDs to be more descriptive (#5634)
* Renames various reagent IDs to be more descriptive (#35824)

* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION

* Renames various reagent IDs to be more descriptive

* fixes compile issues with Travis
2018-02-24 09:35:48 -06:00
CitadelStationBot
ece7f0e905 Adds two more drinks, Bastion Bourbon and Squirt Cider (#5681) 2018-02-24 06:11:45 -06:00
CitadelStationBot
567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
2018-02-23 17:42:57 -06:00
CitadelStationBot
4351621e7d [MIRROR] Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#5673)
* Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#35779)

* - Makes it possible to load the rped with beakers, assemblies and other such parts

* - Fixes cell ratings being not really related to desirability

* - sorry uhhh emp cells need to be slightly better than regular cells

* Enables the RPED to construct/replace beakers, igniters and bluespace crystals
2018-02-23 17:42:24 -06:00
CitadelStationBot
099157b8ff [MIRROR] Renames neurotoxin2 (the toxin, not the drink) (#5666)
* fentanyl (#35882)

* Renames neurotoxin2 (the toxin, not the drink)
2018-02-22 23:43:23 -06:00
CitadelStationBot
f1b88666ef [MIRROR] Rebalances Hearty Punch (#5643)
* Rebalances Hearty Punch (#35836)

Changed healing rates to be more in par with Atropine but not as weak.
Increased metabolization rate.

balance: Rebalanced healing properties. Metabolization rate upped.

It still allows you to keep on fighting during duress and its combat properties have remained untouched. Also, I think it's an oversight that something with this much alcohol could heal what would be proper ethanol damage suffered from consuming what is a high amount of BAC you'll get from drinking a cocktail like this

* Rebalances Hearty Punch
2018-02-21 19:44:37 -06:00
AnturK
73928eb9c0 Fixes patches runtime when applying to missing limbs. (#35845)
* Fixes patches runtime when applying to missing limbs.

* Some feedback.
2018-02-21 11:41:51 -06:00
CitadelStationBot
1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
CitadelStationBot
7ef05e33ad [MIRROR] Mime's Bane recipe (#5592)
* Mime's Bane recipe (#35570)

* Makes Mimes's Bane use the new EMOTEMUTE trait

It randomly occured to me that I should do this.

Mime's Bane is currently a reagent currently only used in cloning pods
to stop growing clones from gasping from crit/lack of air (since they're
in a pure nitrogen environment).

* 2 Mime's Bane = 1 Mute Toxin + 1 Nothing

* Mutetoxin + nothing + radium

* Mime's Bane recipe
2018-02-19 10:23:20 -06:00
CitadelStationBot
cdd8e1e590 [MIRROR] Removes one dotty boi (#5575)
* Removes one dotty boi

* Removes one dotty boi
2018-02-18 17:39:37 -06:00
deathride58
316cfb3ab4 Merge pull request #5569 from Citadel-Station-13/upstream-merge-35756
[MIRROR] [s] makes chemical mob spawning log
2018-02-18 23:30:33 +00:00
deathride58
12e8ca50b3 Merge pull request #5568 from Citadel-Station-13/upstream-merge-35746
[MIRROR] Actually fixes SCP 294 overlay problems
2018-02-18 23:30:20 +00:00
kevinz000
a1074d361e [s] makes chemical mob spawning log (#35756)
* Rudimentary logging

* Update recipes.dm
2018-02-18 11:34:04 -06:00
vuonojenmustaturska
cfdcabfe12 Merge pull request #35746 from MoreRobustThanYou/patch-60
Actually fixes SCP 294 overlay problems
2018-02-18 11:33:55 -06:00
Ordonis
1094e5b69e Newliquors (#35581)
* Adds a few new liqueurs and cocktails

How the fuck in THIS game of all games do we not have Triple Sec.
SERIOUSLY.

* Well there goes a one commit clean PR rip me

reeeeee

* Adds sounds, fixes colors

* Fixes recipies giving eggnog

Don't ask

* Adds space where space should be

* Travis stop stalling reeeeeee

* Fixes spelling mistakes

* Adds some health benefits to sec drinks.

Quadruple sec is mild, but easy to make; quintuple sec is STRONG but
more difficult.

* Fixes merge conflict annoyance

* FUCK

* Updates boozepwr of Quadruple/Quintuple sec

If someone ever adds sex on the beach as a cocktail, I fully expect them
to add in Sex-tuple Sec as well.

* Makes clowntears reagent explicit within food_reagents

Removed hacky solution, introduced better one
2018-02-18 11:33:37 -06:00
deathride58
1447d4106f Merge pull request #5507 from Citadel-Station-13/upstream-merge-35478
[MIRROR] Added chemical reaction unit tests
2018-02-18 00:56:37 +00:00
deathride58
5374724165 Merge pull request #5535 from Citadel-Station-13/upstream-merge-35707
[MIRROR] Adds rainbow slime clusterbangs
2018-02-17 19:31:20 +00:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668
[MIRROR] Quote the armor lists
2018-02-17 19:29:50 +00:00
yorii
f0be955c17 Adds Modafinil properly this time. (#34908)
* Adds modafinil, a sleep suppressant

* Adds recipe for modafinil

Yes I'm afraid of git now

* Fixed modafinil sleepimmune ids and OD to 15u

During testing 10u was simply much too low

* Change OD sleeping proc to use ignore_sleepimmune

* Fixed stuff to modafinil
2018-02-17 09:38:08 -06:00
BordListian
24ab7e0a84 Adds rainbow slime clusterbangs (#35707)
* - slime
- yes

* - Adds a volatile reaction

* - There is no escape from the standards that live within
- Can't wait for the experimentor review
2018-02-17 00:47:03 -06:00
LetterJay
61b5191f90 Merge pull request #5528 from Citadel-Station-13/upstream-merge-35702
[MIRROR] Removes secondary
2018-02-16 12:10:55 -06:00
Jordan Brown
238591128c Merge pull request #35697 from praisenarsie/patch-34
Fixes addiction text
2018-02-16 10:33:32 -06:00
Jordan Brown
fc7dbc8322 Merge pull request #35702 from DaedalusGame/scholar-of-the-first-sin-edition
Removes secondary
2018-02-16 10:32:18 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58
18f4d78449 Merge pull request #5512 from Citadel-Station-13/upstream-merge-35680
[MIRROR] Fixes SCP-294 losing its top sometimes
2018-02-16 01:32:41 +00:00
deathride58
05ab5f7c0c Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552
[MIRROR] [s]Fixes writing bugs/exploits
2018-02-16 01:32:23 +00:00
vuonojenmustaturska
002f0c41dc Merge pull request #35680 from MoreRobustThanYou/patch-60
Fixes SCP-294 losing its top sometimes
2018-02-15 16:24:28 -06:00
ShizCalev
98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
Cruix
5005fb20c6 Added chemical reaction unit tests 2018-02-15 14:34:41 -06:00
KorPhaeron
0ed0abbd4c Slime Radio Potion (#35548)
* Slime Radio Potion

* Deletes inaccurate comment
2018-02-15 10:38:59 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
vuonojenmustaturska
379ff0546a Merge pull request #35541 from 81Denton/chem-conflicts
Fixes lye/plastic/charcoal conflicts
2018-02-12 09:02:42 -06:00
CitadelStationBot
51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456
[MIRROR] [s] Fixes altclick exploits
2018-02-11 09:43:09 -06:00
CitadelStationBot
74c083fc89 Merge pull request #5416 from Citadel-Station-13/upstream-merge-35188
[MIRROR] Adds a SCP-294 ruin
2018-02-11 07:38:37 -06:00
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
Mokiros
cdcb5fc72f Buildable and upgradable All-In-One Grinder (#35451)
Circuit is in "Biological Processing" techweb node
2018-02-11 05:12:23 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
deathride58
21be004afa Merge pull request #5406 from Citadel-Station-13/upstream-merge-35424
[MIRROR] Replaces some var values with defines
2018-02-11 02:24:48 +00:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
Jordan Brown
bd0b5c2eb5 Merge pull request #35479 from Cruix/chem_collisions
Fixed chemical recipe conflicts
2018-02-10 11:04:34 -06:00
Ordonis
0e22f30c39 Switched nitrogen for ethanol in morphine recipe. (#35437)
* Fixes Ordo not testing shit properly

* Lowers yield for balance purposes

Fug
2018-02-10 10:00:25 -06:00
vuonojenmustaturska
73cd1ec431 Merge pull request #35446 from 81Denton/can-synth
can_synth uses TRUE/FALSE
2018-02-09 12:49:26 -06:00
81Denton
d68cd9fe9a Prevents fungal TB spores from being synthesized (#35381)
* can_synth 0 for fungal TB

* 0 -> FALSE
2018-02-07 04:57:58 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
CitadelStationBot
b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333)
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
2018-02-06 18:24:51 -06:00