dc60cc1726
DNA modifiers work now.
...
Conflicts:
code/defines/obj/hydro.dm
code/game/machinery/cloning.dm
code/game/machinery/hydroponics.dm
code/modules/mob/living/carbon/zombie/zombie.dm
code/modules/mob/transform_procs.dm
2014-01-20 00:54:46 -05:00
0ec4a502fe
Updated Chemistry Colors
2014-01-19 21:16:18 -05:00
90496be20a
Standardized intent names so it's all harm. Fuck you hurt.
2014-01-19 08:30:50 -05:00
a40ee3b8ec
Revert "Rework of colour mixing"
...
This reverts commit 1f0e1f6209
2014-01-19 05:36:54 -05:00
1f0e1f6209
Rework of colour mixing
...
Conflicts:
code/modules/reagents/Chemistry-Colours.dm
2014-01-19 05:29:40 -05:00
7541463e01
Moved Supermatter.dm out of the WorkInProgress directory.
...
Conflicts:
baystation12.dme
2014-01-17 09:01:09 -05:00
208f5fd592
Removes the second holywater
...
Deletes the second kind of holy water that doesn't do anything. Lemme
know if I should do the opposite of this.
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-01-17 08:57:11 -05:00
a99b45a3bd
Able to melt decapitated heads into skulls with acid
2014-01-15 08:10:33 -05:00
2a3620b90f
Merge pull request #114 from alex-gh/tweaks_and_fixes
...
Tweaks and fixes
2014-01-12 23:55:12 -08:00
a8e73dbef7
Nerfed unstable mutagen rads, buffed radium rads
2014-01-13 06:13:31 +01:00
7fdb4ac503
APC NanoUI
...
* Created new APC UI
* Tweaked Chem Master UI width.
Conflicts:
code/modules/power/apc.dm
nano/templates/apc.tmpl
2014-01-12 21:52:06 -05:00
c8bc025cc7
Fix holywater hurting full power vampires
2014-01-11 04:41:32 -05:00
27c35cfdac
Added spider meat recipes
...
Conflicts:
code/modules/food/recipes_microwave.dm
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
2014-01-11 00:16:12 -05:00
600bfba275
Colour fix for bread slices.
2014-01-11 00:02:07 -05:00
2f0cb6635b
Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food.
2014-01-11 00:01:34 -05:00
2cd1580acd
Added filling_color var to food items for use in sandwiches.
...
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/food/snacks/grown.dm
2014-01-10 23:56:24 -05:00
e2bbbb7e39
Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
...
Conflicts:
code/modules/mining/mine_turfs.dm
2014-01-09 20:56:38 -05:00
3789e82f7b
Roasted diona, for ZomgPonies/Paradise.
...
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
2014-01-09 09:14:20 -05:00
404ee2ac1f
typo fix
2014-01-09 06:02:45 +01:00
d239894e9b
Removed water recipe, reagent fixes
2014-01-09 03:00:05 +01:00
f66b5a3ccc
Removed a return.
2014-01-06 23:47:46 -05:00
e0d803d158
Made syringes take from the reagents datum of a NO_BLOOD mob rater than vessel.
2014-01-06 23:47:21 -05:00
a8c8bb7fa6
Added NO_BLOOD checks to drips, syringes.
...
Conflicts:
code/modules/organs/blood.dm
2014-01-06 23:46:58 -05:00
5d04a41151
NanoUI updates.
...
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).
Conflicts:
code/game/objects/items/devices/PDA/PDA.dm
code/game/objects/items/devices/uplinks.dm
code/modules/reagents/Chemistry-Machinery.dm
nano/css/shared.css
2014-01-05 23:28:52 -05:00
74e6b51b88
Silver slimes now produce drinks upon injection with water. ( #345 )
2014-01-05 00:50:20 -05:00
227fbc8cbe
Changed green slime extract effect
2014-01-04 22:22:12 -05:00
1458a5834f
Missed a spot
2014-01-04 18:46:23 -05:00
bf9ba0f658
Added and Adjusted Chemicals
...
Fixes with the changes of eyes to internal organs with Imidazoline and the surgery.
New chemicals:
Peridaxon, Potassium Chloride, and Potassium Chlorophoride. Peridaxon: Internal organ healing chemical; 2Bicard+2Clonex(plasma catalyst). Potassium Chloride: Stops hearts for medical in overdose; Salt+Potassium, Potassium Chlorophoride: Stops hearts right proper; PotassiumChloride+Plasma+Chloral Hydrate.
Chloral Hydrate and Soporific changes
Made chloral hydrate less instakill(nerfed), but a toxic dropper without blackscreen. Soporific buffed, but less blackscreen sleeping applied.
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
code/setup.dm
2014-01-04 15:59:22 -05:00
6827a12afe
Fire extinguishers can now spray any reagent desired.
2014-01-03 21:22:53 -05:00
2c0315a56c
Small holy water vamp fix
2014-01-03 20:58:09 -05:00
7bbf936f45
Added space cleaner refiller
2014-01-03 14:09:30 -05:00
a0d866b366
Popable cans and beer cans
2013-12-31 21:44:21 -05:00
9ad437b8c5
Adding checks for LAssailant everywhere whee
2013-12-23 04:57:44 -05:00
21666af24d
Organ/Surgery Overhaul Part 2
2013-12-19 08:59:02 -05:00
5ce256b73c
Organ/Surgery Overhaul Part 1
2013-12-19 07:25:55 -05:00
e29afdaf2b
Dirt overlay fixes
2013-12-17 07:25:42 -05:00
912601a30d
Vampire Gamemode!
2013-12-13 19:38:49 -05:00
cf6092280a
Holiday cheer hats, including Ian versions
2013-12-12 03:52:48 -05:00
31dd8daaf4
Diona will take five times as much damage from plant-B-gone as previously.
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2013-12-11 04:39:22 +01:00
03a899309a
Amatoxin is a slow delayed poison now
2013-12-02 11:30:57 +01:00
47135f9adf
Added thanksgiving recipes
2013-11-29 07:13:41 -05:00
6467bbbb39
Added growing and rolling your own weed, tobacco, tea, coffee
2013-11-27 16:51:04 -05:00
449bdf9bd2
Added condiment packs
2013-11-27 07:31:45 -05:00
9756d1e311
Fueltanks explode if too hot.
2013-11-24 03:13:10 -05:00
53a2925d67
Some new food recipes
2013-11-24 02:30:44 -05:00
84b6c49df9
Fixed typo in boozeomat code
2013-11-21 21:22:23 +01:00
1f2a493caa
Roman-style ambrosia wreaths
2013-11-14 15:21:24 -05:00
41720c8c2b
Fixed an icon bug with booze and soda dispencers.
...
Booze and soda dispencers accept glassware now.
Made the selection in booze and soda dispencers more sensible.
Generalised dispencer hacking code.
Added toxins and plasma to hacked chem dispencer.
2013-11-11 13:34:44 +01:00
9ec8abdcda
Updated autoinjectors name and description to reflect their content and purpose
2013-11-09 23:21:13 +01:00
7b90987f79
Autoinjectors now contain tramadol and hyperzine instead of doctors delight
2013-11-09 12:21:57 +01:00
Rob Nelson