424a2522b9
CIVILLIAN OVERHAUL UNO: Chef and the Kitchen
...
Conflicts:
baystation12.dme
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
icons/obj/kitchen.dmi
2014-05-03 21:15:41 -04:00
abcb0bc686
Lousy goddamn indentation.
2014-05-03 17:36:17 -04:00
a7f0508a1e
Attempting to stop IPC from eating and drinking.
2014-05-03 17:36:05 -04:00
f9a773c84d
Fix smoke
2014-04-20 02:34:40 -04:00
56d8ce28c8
Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
...
* Implements stacking and stack overlays
* Simplified tiers of cash (1,10,100,500,1000, may remove 500)
* Simplified API (dispense_cash, count_cash)
Conflicts:
code/modules/admin/admin_verbs.dm
code/modules/admin/verbs/debug.dm
code/modules/economy/ATM.dm
2014-04-19 20:47:41 -04:00
c43652b33a
Okay shards converted to pool usage now.
...
Conflicts:
code/game/machinery/computer/arcade.dm
code/game/machinery/doors/windowdoor.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/objects/structures/displaycase.dm
code/modules/mining/mine_turfs.dm
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
2014-04-19 19:57:53 -04:00
f98a2af41f
Fueltanks leak fuel when wrenched open
...
Fueltanks now actually leak fuel when wrenched open. The leaking only occurs at the initial wrenching and when tank is moved.
Conflicts:
code/modules/reagents/reagent_dispenser.dm
2014-04-19 16:41:17 -04:00
f43ef06431
Virology - NanoUI, gameplay tweaks, bugfixes
...
Conflicts:
.gitignore
code/game/machinery/kitchen/smartfridge.dm
code/game/machinery/machinery.dm
code/modules/food/recipes_microwave.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/virus2/isolator.dm
nano/js/nano_base_helpers.js
2014-04-19 15:42:49 -04:00
d3757b9413
Hyperzine bottle
...
A pre-spawned bottle of hyperzine
2014-04-16 09:49:20 +09:30
cfbfa0e993
Smoke rework caused endless loops, reverted.
2014-04-08 01:47:56 +02:00
521ad31671
Revert the new lighting system.
2014-04-07 23:51:35 +02:00
9bea0a097a
trans_to_ingest now used for consumption of food, drink and pills instead of trans_to. This adds a ten second delay between ingestion and addition of the reagents to the body.
...
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/reagent_containers/food/cans.dm
code/modules/reagents/reagent_containers/food/condiment.dm
2014-04-05 17:39:14 +02:00
c74ff2d653
Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays
...
Conflicts:
code/modules/reagents/reagent_containers/glass.dm
2014-04-03 21:42:33 +02:00
99751c0416
Reagent reaction_mob/turf tweaks
...
- Adds an if() check to reaction_mob for catching a very rare runtime related to mobs inhaling smoke reagents from just deleted smoke.
- Carbons reaction_turf proc now modifies a single dirt overlay layer, instead of just adding more decal objects to the turf.
- Added some checks to the radium and uranium reaction_turf proc so it doesn't stack multiple greenglow decals.
- Performed colon removal surgery on thermites reaction_turf proc, also tweaked it's overlay operation to correctly overlay a chemical puddle effect, instead of a melted wall effect.
- Removed space_cleaners overlays.Cut() code, since it was removing decals from turfs.
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-04-03 18:21:45 +02:00
0fba806c7b
Chemsmoke rewrite
...
- Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
- Moved it into it's own file since it's a little longer than the old one code-wise.
- Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.
Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
- Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
- The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
- The carried reagent has more volume the closer you are to the centre of the cloud.
- The visual smoke effect scales with how big the affected area is.
Conflicts:
code/game/objects/effects/effect_system.dm
icons/effects/96x96.dmi
2014-04-03 18:21:26 +02:00
7f4388c5a3
Cleaned the fuck out of smoke.
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
code/game/objects/effects/effect_system.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/organs/organ_external.dm
2014-04-03 18:18:04 +02:00
2b5dbab3b2
Blob spore infection is now curable, added indication for blob infection
2014-03-24 12:08:20 +01:00
ee2fee1371
Killing blob spores can now infect you with the blob
2014-03-23 23:36:19 +01:00
072bdcde60
I think I fixed everything it is possible to stuff a light source into.
...
Conflicts:
code/game/dna/dna_modifier.dm
code/game/machinery/Sleeper.dm
code/game/objects/structures/transit_tubes.dm
code/modules/reagents/Chemistry-Machinery.dm
code/modules/recycling/disposal.dm
2014-03-21 09:58:54 -04:00
f1cdebaa60
Fixed custom item
2014-03-14 03:41:34 -04:00
0e8c675d18
Invert SOBER behavior, seems to work better that way.
...
Conflicts:
html/changelog.html
2014-03-11 16:01:36 -04:00
79088a5668
Paracetamol side effect should work now
2014-03-10 12:59:06 +01:00
dcebe3aae1
Paracetamol will now metabolize properly
2014-03-10 12:22:45 +01:00
c751ee454c
Small fixes
2014-03-06 22:45:38 -05:00
22765ac4d7
autoinjector
2014-03-06 20:13:48 -05:00
ec225e3344
fixes flatdough sprite
2014-03-06 18:22:57 -05:00
c9fbe145d9
paracetamol
2014-03-03 15:23:35 -05:00
5bb608e56e
Redo of jitteriness and dizziness.
...
Fixes #2923
Conflicts:
code/game/gamemodes/changeling/changeling_powers.dm
code/game/mecha/equipment/weapons/weapons.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/mob.dm
code/modules/mob/mob_defines.dm
code/modules/reagents/Chemistry-Reagents.dm
2014-02-28 22:21:33 -05:00
1ab8df4b13
Garbage collection fixes
2014-02-19 20:24:31 -05:00
917370a608
Jay Owen demands that this pull be merged.
...
Crush a can for Jay Owen.
He has leukemia, please crush a can for Jay Owen.
His only wish is to see a can crushed live in our game.
Sprites by Nienhaus
Conflicts:
code/game/objects/items/trash.dm
code/modules/reagents/reagent_containers/food/drinks.dm
icons/obj/janitor.dmi
2014-02-16 05:42:55 -05:00
4cd875c88a
Various Tweaks and Fixes
...
Adds a replacement for Doctor's Delight (For Syndicakes, valid salad,
etc), fixed chem dispenser NanoUI sizing, and change plasma color from
orange to the canonical purple.
2014-02-02 06:27:13 -05:00
1910e1054d
Indentation fix.
2014-02-02 00:45:23 -05:00
0bfa853e76
Fixed some cocked up checks for alien var.
2014-02-02 00:45:01 -05:00
656eaddbd3
Added some limited support for alien reagent reactions.
...
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
2014-02-02 00:44:44 -05:00
564c7bd6ac
Fixing up alien reagents
2014-02-02 00:35:51 -05:00
f77a0e147b
Golem runes use a different method for signing up.
...
Conflicts:
code/modules/mob/living/carbon/metroid/metroid.dm
html/changelog.html
2014-02-01 21:28:17 -05:00
c69ddf76ec
Reintroducing the dough-based cooking system.
...
Conflicts:
code/modules/food/recipes_microwave.dm
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
2014-02-01 19:22:22 -05:00
311528762c
Walking mushrooms will inherit some of the original properties of the food item that they were spawned from.
...
Walking shrooms with ckeys will not gain levels, unlike wild ones, to keep things from getting silly.
2014-02-01 05:30:44 -05:00
f85ac1af63
Walking mushrooms will now hunt and eat eachother, growing stronger when they do! The stronger they get, the better the quality of the mushroom slices you can butcher out of them! Don't smack em yourself though, or you'll bruise them, and they won't get stronger from being eaten.
...
Conflicts:
baystation12.dme
code/modules/mob/living/simple_animal/friendly/mushroom.dm
2014-02-01 05:27:59 -05:00
c3b021e246
Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.
...
And holy shit it's fast
Conflicts:
baystation12.dme
code/ATMOSPHERICS/pipes.dm
code/game/machinery/Sleeper.dm
code/game/machinery/rechargestation.dm
code/game/objects/structures/crates_lockers/crates.dm
code/game/objects/structures/tables_racks.dm
code/modules/mining/mine_turfs.dm
code/modules/paperwork/photocopier.dm
code/modules/power/cable.dm
html/changelog.html
2014-01-29 23:45:21 -05:00
57f113b427
Chemistry and Brain Damage
2014-01-29 00:58:58 -05:00
22f6bb90be
Add additional extinguisher logging, transfer logging framework.
...
Conflicts:
code/game/objects/items/weapons/extinguisher.dm
2014-01-25 12:29:21 -05:00
95f7280781
Generic attack sounds for all melee weapons
...
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.
Conflicts:
code/game/gamemodes/wizard/artefact.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/melee/misc.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/weaponry.dm
code/game/objects/weapons.dm
code/modules/hydroponics/hydroitemdefines.dm
code/modules/surgery/tools.dm
2014-01-22 10:15:43 -05:00
7892eeb7cc
Standardize LASER, NOCLONE, and HUSK
...
Conflicts:
code/game/gamemodes/changeling/changeling_powers.dm
code/modules/mob/living/carbon/human/death.dm
maps/RandomZLevels/wildwest.dm
2014-01-21 22:59:53 -05:00
f44ff1d7aa
Standardize FAT
...
Conflicts:
code/modules/client/preferences.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/constructs.dm
code/modules/mob/mob.dm
code/modules/mob/mob_grab.dm
2014-01-21 22:57:10 -05:00
d49e6d3bf4
Standardize CLUMSY
...
Conflicts:
code/game/jobs/job/civilian.dm
code/game/objects/items/weapons/defib.dm
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
95cc6a27b5
Standardize mutation constants, remove ambiguity, remove non-implemented muts.
...
Conflicts:
code/_onclick/click.dm
code/game/dna/genes/powers.dm
code/game/machinery/wishgranter.dm
code/modules/mob/living/carbon/alien/alien.dm
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/larva/life.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_movement.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/damage_procs.dm
code/modules/mob/living/living.dm
code/modules/power/lighting.dm
code/modules/reagents/Chemistry-Recipes.dm
code/setup.dm
maps/RandomZLevels/wildwest.dm
2014-01-21 22:36:19 -05:00
cb5367ed96
Switching cable coils to stacks
2014-01-21 21:23:26 -05:00
460621bf97
Sober gene implementation
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-01-21 14:39:32 -05:00
520a2cd401
NanoUI changes from Faerdan
...
Conflicts:
code/game/dna/dna_modifier.dm
code/game/machinery/cryo.dm
code/modules/nano/nanomanager.dm
code/modules/nano/nanoui.dm
code/modules/reagents/Chemistry-Machinery.dm
2014-01-20 02:02:31 -05:00
iamgoofball