Commit Graph

1944 Commits

Author SHA1 Message Date
VisVirific
67a30ec25b Dropper and Pipettes Additions (#13846) 2022-05-12 21:56:32 +02:00
VisVirific
6c24573c04 Chem Bottles, Beakers and Medcup Resprites (#13399) 2022-05-07 14:27:11 +02:00
VisVirific
190198d19b Lazarus Injector and Medical Synthesizer Additions (#13737) 2022-05-06 16:45:49 +02:00
Llywelwyn
9ae487dd02 Adds specific heat value to Ambrosia Extract (#13729) 2022-05-01 16:39:02 +02:00
VisVirific
ab4bc6a847 dropper reagent filling overlay bugfix (#13709) 2022-04-30 22:37:28 +02:00
VisVirific
c475e9d010 Shaker and Cyborg Drink Synthesizer Additions (#13652) 2022-04-27 17:45:35 +02:00
Doxxmedearly
89d3830496 Cigarettes don't kill your liver (#13616) 2022-04-24 12:45:27 +02:00
mikomyazaki
0f239e255c Can crack eggs into reagent containers again. (#13608) 2022-04-22 00:51:40 +02:00
Doxxmedearly
14b9384c43 No more scooping/eating food message spam (#13556) 2022-04-21 10:47:54 +02:00
mikomyazaki
e59589ec8a Gripper attackby fixes (#13571)
This cannot go wrong, can it?
2022-04-20 22:15:15 +02:00
VisVirific
8bf5b5f31e Bloodpack Labels Additions (#13539) 2022-04-19 19:09:54 +02:00
Xxxxyobdab
f08b106522 Berry Redelightful (#12990) 2022-04-19 12:01:52 +02:00
KingOfThePing
fedefa4ce3 Description fix, blood pack addition and fixed floating text (#13536) 2022-04-16 13:55:38 +02:00
alberyk
ad8932a15c Merge branch 'master' into final_master_push 2022-04-09 18:08:53 -03:00
SleepyGemmy
d32617daac Zo'ra Soda Rework (#13266) 2022-04-09 17:50:23 +02:00
mikomyazaki
17ec460cc5 Toxins suppress natural liver healing rate. (#13420) 2022-04-08 16:42:06 +02:00
sadkermit
79372075e8 Recreational Drug & Toxins Tweaks & Additions (#13129)
This took way too long.
2022-04-08 16:38:18 +02:00
alberyk
8c1d2a7cde Merge branch 'master' into final_away_maps_additions
# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm
2022-04-04 19:47:58 -03:00
VisVirific
5d4d66c0f5 Lung Rescue on Vaurca Restriction (#13408) 2022-03-24 10:54:44 +01:00
alberyk
2f93df0e0f Merge branch 'master' into init_update_and_stuff 2022-03-05 17:05:46 -03:00
VisVirific
5fbaeb57d9 Fixes Invisible Blood Bags (#13323) 2022-03-05 13:33:23 +01:00
Wowzewow (Wezzy)
a2f6f55584 Beakers, bottles and syringe resprite (#13096) 2022-03-04 18:45:19 +01:00
alberyk
f0e32eec35 Merge branch 'master' into ship_and_stuff
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
2022-03-04 14:00:19 -03:00
Aticius
13113a24ec Adds a Synthflesh recipe to the Biogenerator; Refluffs Biomeat. (#13258) 2022-03-01 17:10:31 +01:00
Sparky
4db7121041 Injecting reagent containers sends nearby mobs a warning (#13261) 2022-03-01 17:09:22 +01:00
Sparky
499160699f Quality Bugs of Fixes Life (#13274) 2022-02-28 13:30:20 +01:00
gem
8be14494b3 Hro'zamal Typo Fix (#13279) 2022-02-26 23:07:09 +01:00
VisVirific
b70ced9eff Peanuts, and Toasts, and More (#13209) 2022-02-25 18:34:50 +01:00
alberyk
12a70b50b7 Merge branch 'master' into updates_the_nbt
# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm
2022-02-19 10:26:35 -03:00
VisVirific
00ffc73ddb Inhalers and Autoinhalers Quality of Life (#12982) 2022-02-19 10:09:15 -03:00
mikomyazaki
ac02830506 Fixes heating nitroglycerin. (#13201) 2022-02-18 12:13:31 +01:00
VisVirific
6e4e295e8a Lung Rescue Tweaks (#13056) 2022-02-18 12:06:09 +01:00
VisVirific
cd9547f180 AltClick Transfer Rate for Hyposprays and Syringes Quality of Life (#13124) 2022-02-15 23:27:27 +01:00
alberyk
beecb5f802 Merge branch 'master' into fourth_week_preparation_and_fixes
# Conflicts:
#	code/game/jobs/faction/zavodskoi.dm
2022-02-10 13:36:46 -03:00
VisVirific
766a779a7b Autoinjector Slot Tweak (#13080) 2022-02-08 11:41:38 +01:00
alberyk
a61a4b7e2c Merge branch 'master' into fixes_compile 2022-02-04 14:22:38 -03:00
Wowzewow (Wezzy)
ba6e7b6014 Chemistry Sprite Tweaks (#13041) 2022-02-04 12:21:49 +01:00
alberyk
cf3b089df4 Merge branch 'master' into final_shuttle_touches_and_stuff
# Conflicts:
#	code/modules/power/breaker_box.dm
2022-01-17 19:36:22 -03:00
Casper3667
63c6d26c90 Changes some parts of forensic (#12869) 2022-01-16 14:20:23 +01:00
alberyk
4b32268c1a Merge branch 'master' into final_shuttle_touches_and_stuff
# Conflicts:
#	code/game/objects/structures/window.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
2021-12-21 16:51:40 -03:00
Casper3667
bd827bac39 Removes name tags on food and fruits when examined (#12794) 2021-12-02 22:57:09 +01:00
Casper3667
14cd85881e Adds toasting (#12798) 2021-12-01 18:45:04 +01:00
Casper3667
0282f6c596 Fixes red nightshade (#12786) 2021-11-27 13:37:42 +01:00
Casper3667
e39afd260b Makes dexalin always dangerous to vaurca (#12745)
Co-authored-by: TGW <mc-casper@hotmail.dk>
2021-11-13 13:42:10 +01:00
Casper3667
c84cf340b8 fixes vaurca surgery and permanent blindess (#12723)
Co-authored-by: TGW <mc-casper@hotmail.dk>
2021-11-07 21:28:50 +01:00
alberyk
2294b4f0c5 Merge branch 'master' into computer_tweaks
# Conflicts:
#	code/game/jobs/faction/eridani.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/civilian_chaplain.dm
#	code/game/jobs/job/science.dm
#	icons/obj/machines/shielding.dmi
2021-10-29 21:41:30 -03:00
LocoTokyoFunBus
74d08e8f40 Skrell recipe tweak (#12661) 2021-10-22 17:50:33 -03:00
desven
bdf6882f65 More lore foods (#12645) 2021-10-19 20:47:28 -03:00
Casper3667
9133ddff93 adds several new coffee cups (#12627) 2021-10-17 20:44:41 -03:00
desven
3bbe736c69 Fixes k'ois bite sizes for real (#12629) 2021-10-15 19:07:17 -03:00