3d0f914a2c
Merge pull request #6770 from Citadel-Station-13/upstream-merge-37869
...
[MIRROR] Adds Fernet, a digestif that reduces your satiety.
2018-05-19 09:15:46 -05:00
cad56985a0
Merge pull request #6799 from Citadel-Station-13/upstream-merge-37894
...
[MIRROR] Fixes dizziness on some drinks
2018-05-19 09:14:46 -05:00
3e0eaa5e65
fixes g.blaster, neurotoxin, nuka cola dizzines ( #37894 )
2018-05-19 05:32:28 -05:00
7f66ccfc2b
Removes inherent toxin damage from lipolicide ( #37874 )
...
* Removes inherent toxin damage from lipolicide
* Update description of lipolicide
2018-05-18 16:47:20 -05:00
204043bc26
Update borghydro.dm
2018-05-17 23:44:58 -05:00
348b350295
Update alcohol_reagents.dm
2018-05-17 23:44:47 -05:00
e2bcf82341
Adds Fernet, a digestif that reduces your satiety.
2018-05-17 10:19:40 -05:00
8efc7711a7
Merge branch 'master' into upstream-merge-37423
2018-05-16 12:17:57 -05:00
f9f42658e1
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
...
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-14 12:28:41 -05:00
ca86c93e70
Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406
...
[MIRROR] Adds (fake) ambient occlusion as a client preference
2018-05-13 11:52:23 -05:00
3ce9fba8bf
Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589
...
[MIRROR] Adds 5 new drinks
2018-05-13 11:52:12 -05:00
6d5e085fd0
Update alcohol_reagents.dm
2018-05-13 10:15:26 -05:00
8463204549
Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers
2018-05-12 18:53:59 -05:00
021f30f0c0
Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-11 17:30:32 -05:00
ec3516ea19
[s] Hallucinations 4.0
2018-05-09 16:15:58 -05:00
bc6fbeb9fe
Adds (fake) ambient occlusion as a client preference
2018-05-07 22:08:08 -05:00
d09ae95d42
Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) ( #37609 )
...
* Update alcohol_reagents.dm
* removes period
2018-05-02 17:31:22 -05:00
2fe4591a12
Adds 5 new drinks
2018-05-01 13:42:48 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
6f13d2c2e9
Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380
...
[MIRROR] Refactors and fixes RPEDs
2018-04-29 22:45:28 +00:00
9b36d6c4d9
Re-adds and reworks fusion. ( #37384 )
...
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
2018-04-28 01:01:47 -05:00
4850230fc4
Refactors and fixes RPEDs
2018-04-27 13:13:37 -05:00
2ee4d3e77d
Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326
...
[MIRROR] Removes SCP_294
2018-04-27 09:35:43 +00:00
a44347f6e8
Merge pull request #6496 from Citadel-Station-13/upstream-merge-37365
...
[MIRROR] Improves fuel tank explosion logging
2018-04-27 09:28:16 +00:00
17aa0acef8
Removes SCP_294 ( #37326 )
...
* aaah sweet essence
* bye bye sprites
* goodbye machine code
* bye bye blacklist entry
* whoops
* scp gone from runtime
* bye bye ract
* bye bye space ruin folder
* bye bye area
2018-04-25 10:05:57 -05:00
8587e3f792
Merge pull request #37365 from DaxDupont/fueltank-logging
...
Improves fuel tank explosion logging
2018-04-23 09:40:55 -05:00
5518efebea
everything but mob stuff
2018-04-23 01:06:17 -05:00
e8698ab798
Gives beer and soda dispensers their own circuitboards and Design ID's ( #37315 )
...
* new boards
* new boards installed
* new designs (wow) (woah)
* added the new design ids to the biotech node
* tested
it works, also, that typo fucking stopped it from compiling
2018-04-22 19:19:51 -05:00
26fb305551
zoinks
2018-04-14 10:57:55 -05:00
b56b2a94e8
Fixes SCP 194 not using the amount variable.
2018-04-13 09:03:40 -05:00
d559fc1bd3
remove 512 version checks
2018-04-11 14:26:41 -05:00
e0d7630c19
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
682db30746
Adds new drink sprites for Stinger, Grasshopper, and Quadruple/Quintuple Sec by Mickyan
2018-04-08 19:26:38 -05:00
5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
107ccfda10
Tweaks mixed blood samples to preserve cloneable if the samples are the same ( #36961 )
2018-04-06 01:54:15 -05:00
cd251d79b2
Merge pull request #6264 from Citadel-Station-13/upstream-merge-36645
...
[MIRROR] Fixes mannitol not curing minor brain traumas
2018-04-04 21:11:28 +00:00
057d10f654
Fixes chem macros with trailing ;
2018-04-04 09:04:53 -05:00
1ee5b349d7
Fixes mannitol not curing minor brain traumas ( #36645 )
...
* Fixes mannitol not curing brain traumas
* Makes has_trauma_type random, adds type arg to cure_trauma_type
* Adds get_traumas_type proc
* Default to /datum/brain_trauma
2018-04-03 22:03:20 -05:00
9bb405d27c
Merge pull request #6147 from Citadel-Station-13/upstream-merge-36738
...
[MIRROR] Nutriment can get you fat again.
2018-04-01 17:40:38 -05:00
88f328651f
Update food_reagents.dm
2018-04-01 04:39:21 -05:00
38a1a0fca7
Merge pull request #6198 from Citadel-Station-13/upstream-merge-36804
...
[MIRROR] Fixes silicons being unable to remotely use chemmaster functions
2018-03-31 19:03:13 -05:00
dfc437a00f
Merge pull request #6196 from Citadel-Station-13/upstream-merge-36805
...
[MIRROR] Cleans up duplicate chem_master power_change() proc
2018-03-31 18:44:25 -05:00
df8f936cf8
Merge pull request #6195 from Citadel-Station-13/upstream-merge-36803
...
[MIRROR] [s] Fixes chem dispenser not actually requiring power
2018-03-31 18:44:11 -05:00
d29eb299ec
Fixes silicons unable to remotely use chemmaster
2018-03-31 06:18:13 -05:00
ca7f0796a2
Merge pull request #36805 from ShizCalev/chemmaster-power-change-cleanup
...
Cleans up duplicate chem_master power_change() proc
2018-03-31 06:17:44 -05:00
0273ee6d03
Merge pull request #36803 from ShizCalev/chem-dispenser-exploit-fix
...
[s] Fixes chem dispenser not actually requiring power
2018-03-31 06:17:34 -05:00
73d4e9b11c
Fixes chem dispenser icon desync
2018-03-31 06:16:29 -05:00
13593d757b
Nutriment can get you fat again.
2018-03-28 12:17:06 -05:00
0a63f55771
Makes chem dispenser recharging far less glacial ( #36700 )
...
* meme
* Makes chem dispenser recharging far less glacial
* Update chem_dispenser.dm
2018-03-28 12:15:24 -05:00
4773743eab
Fixes wet floor scaling ( #36697 )
...
* Fixes wet floor scaling
* Meh lets not
2018-03-26 10:49:42 -05:00
LetterJay