Jordie
77911b67ba
Merge pull request #11709 from bgobandit/fuckyouslimesfuckfuckfuck
...
Fixes pink slime potions.
2015-09-13 21:59:08 +10:00
Iamgoofball
265dadea68
Fixes #11752 , resets CLF3's metab. rate to 4u instead of 0.5u
...
@phil235 you forgot to keep it at 4u, which is why CLF3 does so much damage over time
it's supposed to do a lot of damage but metabolize really really fast
you accidentally made it do a lot of damage but metabolize really slowly
2015-09-12 21:31:00 -07:00
bear1ake
c52c4a5346
Merge remote-tracking branch 'tgstation/master' into point-zero
...
Conflicts:
code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
phil235
1db6687314
little tweak
2015-09-11 18:19:10 +02:00
phil235
c069ea0a7d
Fixes runtime in monkey/attack_hand()
...
Fixes tableclimbing: no more success message when failing; you can no longer pass through barricade when tableclimbing.
Fixes runtime with krokodil addiction
Xenomorph can no longer get addicted or overdose on reagents.
2015-09-11 18:08:54 +02:00
bgobandit
5ca28e3e5c
Fixes pink slime potions.
2015-09-10 22:38:15 -04:00
phil235
e74ca82a47
Merge branch 'master' of https://github.com/tgstation/-tg-station into ReagentReactionRuntimeFix
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
icons/obj/assemblies/new_assemblies.dmi
2015-09-10 21:49:39 +02:00
Razharas
17e5d0eea5
Merge pull request #11525 from xxalpha/dryshoes
...
Absorbent galoshes.
2015-09-10 22:01:03 +03:00
bear1ake
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
Aranclanos
fbbdbe17ed
Merge pull request #11666 from tgstation/Fixing_bugs_from_browser_with_edit_button
...
Fixes blood mixing not merging symptoms properly
2015-09-09 12:48:52 -03:00
Razharas
c40dea1ebd
Removes src and renames the argument
...
Removes src and renames the argument
2015-09-09 16:36:40 +03:00
Razharas
524186e4db
Merge pull request #11569 from Anonus/blobchemtweaks
...
Changes blob chemicals
2015-09-09 02:44:34 +03:00
Razharas
54a58ddbf5
Fixes blood mixing not merging symptoms properly
...
Fixes blood mixing not merging symptoms properly
Fix #11482
2015-09-09 01:46:04 +03:00
xxalpha
a62c09bbb7
Merge remote-tracking branch 'upstream/master' into dryshoes
...
Conflicts:
code/__DEFINES/misc.dm
2015-09-08 16:56:37 +01:00
oranges
966ec11958
Adds game and attack logging to rags
...
This adds a proc to help print reagent lists nicely
2015-09-08 12:39:48 +12:00
Fox-McCloud
cbe9ec7fae
Fixes Stimulants Speedbuff
2015-09-06 00:09:30 -04:00
octareenroon91
1327441478
Correct 'You inject' text
...
Injections will now correctly report the amount of reagent you inject. Lethal injection syringes specifically will report correctly.
2015-09-05 16:47:21 -06:00
Nerd Lord
4db08a755a
Actually I think I prefer the old one, it's less red.
2015-09-03 17:28:04 -04:00
Nerd Lord
bfa73cad7d
ah yes, chemistry code
2015-09-03 15:39:38 -04:00
Nerd Lord
7e7b7bc491
Tweaks the fuck out of blob chemicals:
...
Skin Melter, Radioactive Liquid, Omnizine, and Space Drugs blob chemicals are gone.
Added Cryogenic Liquid blob chemical, which does what you might expect.
Changed effects of current blob chemicals to be either more useful or LESS useful.
Also changed the names to look better with a different change in another PR.
2015-09-03 12:34:59 -04:00
xxalpha
4ead972306
Drying agent. Recolor dry shoes
...
use define
2015-09-01 22:59:30 +01:00
Razharas
bfbe4e997e
Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
...
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
Razharas
3bf36ad9a6
Merge pull request #11475 from MrStonedOne/patch-33
...
Changes gold slimes mob list to use initial() and only generate the mob list once.
2015-09-01 09:54:31 +03:00
duncathan
51c09f16bf
makes all Destroy()'s return properly
2015-08-31 00:21:01 -06:00
Kyle Spier-Swenson
cfe1aba809
Cleans up gold slime moblist code.
...
It will only generate the mob list once, and it won't use : (thanks RR)
2015-08-30 21:45:31 -07:00
Cheridan
529059c3f1
Merge pull request #11459 from bgobandit/itsafuckingpotionfuck
...
Refactors slime potions.
2015-08-30 20:34:45 -05:00
Kyle Spier-Swenson
53a1485bf1
Changes gold slimes mob list to use initial()
...
fixes #11434
As far as I know, the use of a : is required for this trick.
2015-08-30 01:03:09 -07:00
bgobandit
14d5cb7340
Refactors slime potions.
2015-08-29 02:42:54 -04:00
Aranclanos
6482bf4e14
Removes the src = null lines from chemistry code, it comes from way back, goons r4407 and its really not needed anymore.
...
Fixes gas reagents not triggering their reaction on some targets.
2015-08-28 17:51:06 -03:00
Cheridan
7f0f74f100
Merge pull request #11380 from bgobandit/salicyclicassblastusa
...
Fixes burn kits containing salicyclic acid pills. Adds new burn medication.
2015-08-27 23:53:58 -05:00
Aranclanos
38e6a09cf9
Merge pull request #11351 from Core0verload/nodirt
...
Removes dirt from walking on tiles
2015-08-26 06:27:31 -03:00
bgobandit
6ab2443255
Adds oxandrolone, a new burn medication designed to work upon ingestion. Adds oxandrolone to burn kits. Adds changelog.
2015-08-25 13:46:05 -04:00
bgobandit
2c56462e97
I sure do love me some copypasta
2015-08-24 22:45:37 -04:00
bgobandit
132adf3f00
adds silver sulf syringes instead of kelotane pills
2015-08-24 21:45:18 -04:00
bgobandit
ce8722b868
Fixes burn kits containing salicyclic acid pills.
2015-08-24 21:36:50 -04:00
c0
9cfb246e4f
Removes dirt from walking on tiles
2015-08-24 11:33:52 +03:00
phil235
ed39df47f7
Fixes two runtimes in reagent reaction code (caused by my recent changes)
...
Fixes timer device not showing its countdown overlay when not attached (sprite was removed by accident probably).
Fixes timer/infrared beam/proximity sensor not being usable when freshly spawned because they weren't being processed.
Fixes infrared beam runtime (when the device is deleted the beam itself isn't, causing runtimes when crossing it).
2015-08-23 17:29:57 +02:00
Jordie0608
5824fedc17
gold core spawnable as var
2015-08-22 16:49:13 +10:00
Jordie0608
94344cd471
changes gold slime core hostile mob list to whitelist
2015-08-19 21:10:36 +10:00
Jordie
bdd6a75382
Merge pull request #11119 from phil235/VaporizeMethodReaction
...
reagents reaction() now has more application method
2015-08-19 19:23:17 +10:00
Jordie
6ad79827dd
Merge pull request #11260 from KorPhaeron/xenobiofix
...
Fixes guardians spawning in xenobio
2015-08-19 18:59:13 +10:00
Remie Richards
f77047b640
Merge pull request #11185 from Cheridan/brycepaxsbrain
...
Logging Syntax Improvement
2015-08-18 20:24:42 +01:00
KorPhaeron
60715b1659
On second thought I'm removing scout anyway
2015-08-18 04:20:09 -05:00
KorPhaeron
54a32d21c2
Comma
2015-08-18 02:21:08 -05:00
KorPhaeron
c4fad66eb4
Update Chemistry-Recipes.dm
2015-08-18 02:05:41 -05:00
phil235
5539689f3a
Merge pull request #11043 from KorPhaeron/moreweebshit
...
Timestop for Wizards
2015-08-16 11:04:47 +02:00
phil235
df758d2fff
Merge pull request #11146 from MMMiracles/biomemes
...
Revamps Bioterror Darts
2015-08-15 22:47:00 +02:00
phil235
7d9a9f1324
Readds blob smoke reagent effect.
...
You can now partially (max is 50%) protect yourself again blob reagent effects (blob smoke and blob attack). Although some effects are unaffected (explosion probability, vortex power, adding fire_stacks).
Changes the "volume" argument used in reaction_mob() to "reac_volume" to avoid confusion with the "volume" variable.
Buffed blob smoke reagent amount from 5 to 10 to counterbalance the nerf from clothes protection.
Blob direct attack now uses the VAPOR method.
2015-08-15 20:56:56 +02:00
phil235
64f028c065
Merge branch 'master' of https://github.com/tgstation/-tg-station into VaporizeMethodReaction
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
2015-08-15 16:36:21 +02:00
phil235
06b94738fa
Merge pull request #11182 from Miauw62/death
...
Makes patches not work on dead people.
2015-08-15 16:17:24 +02:00