Zuhayr
5e87b21d44
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-14 09:32:17 +10:30
mwerezak
0d89717cf2
Merge remote-tracking branch 'upstream/dev' into gun-rewrite
...
Conflicts:
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
mwerezak
01798c98b6
Rewrites syringe and dart guns
2015-02-13 01:34:35 -05:00
Zuhayr
8fb5836e4f
Generalized fruit products properly.
2015-02-13 03:52:46 +10:30
PsiOmega
f8c5cf8f83
Adds a kit with cigarette packs and zippo lighter.
...
Includes 2 packs of flash powder cigarettes, 2 packs of smoke creating cigarettes, 1 pack of mindbreaker cigarettes, and 1 pack of tricordrazine cigarettes.
2015-02-12 16:35:49 +01:00
PsiOmega
73bc5934d5
Replaces uplink Donk-pockets with Sin-Pockets.
...
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.
Makes the concealed cane use non-del methods.
2015-02-11 09:55:50 +01:00
mwerezak
bf24ac82b8
Removes IsHandgun() proc, adds slot flag
2015-02-10 20:25:41 -05:00
PsiOmega
d0a59bcd03
Adds a health section in the uplink.
...
Box of donk-pockets for 1 TC.
Combat medical kit, containing bicardine, dermaline, dexalin plus, dylovene, tramadol, and spaceacillin, for 5 TC.
2015-02-10 21:29:29 +01:00
Zuhayr
402987edc3
Merge with dev.
2015-02-07 14:44:55 +10:30
Zuhayr
43d576dcc5
Merge pull request #8054 from mwerezak/chembottles
...
Replaces chem bottles with their overlay equivalents
2015-02-05 23:05:45 +10:30
Zuhayr
c5e2feb5f1
Merge with dev.
2015-02-05 20:24:06 +10:30
mwerezak
9caf76d069
Glass bottles are now dispensed with the lid on
...
It seemed kind of silly that vendors, for example, would dispense
bottles with their lids off.
2015-02-05 00:41:59 -05:00
mwerezak
8da0fb7f43
Merge remote-tracking branch 'upstream/dev' into chembottles
...
Conflicts:
code/modules/hydroponics/hydro_tools.dm - flags var
2015-02-05 00:37:19 -05:00
mwerezak
59bbf3a883
Replaces chem bottles with their overlay equivalents
2015-02-05 00:31:56 -05:00
Chinsky
f8b94456ba
Merge pull request #7844 from Kelenius/ofDryingAndRacks
...
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
Chinsky
82ca870c53
Merge pull request #8028 from GinjaNinja32/beaker
...
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
2015-02-04 18:14:22 +03:00
Zuhayr
3ff956da69
Moved grown.dm to hydro folder for traits.
2015-02-04 10:46:24 +10:30
Zuhayr
d08861e25b
Moved gas/light/pressure from hydro tray to seed datum
2015-02-04 10:46:10 +10:30
Zuhayr
983ca55c9d
Autopopulates the plant and product icon lists at roundstart. Should make missing plant icons obnoxiously easy to spot due to a world output in bright red.
2015-02-04 10:43:33 +10:30
Zuhayr
e5935e01f1
Span classes.
2015-02-04 10:43:01 +10:30
Zuhayr
78e61d9ccd
Tweaks to xenoflora, added plant icons and colours to all plants.
2015-02-04 10:42:39 +10:30
Zuhayr
5538ce5589
Refactored nettles and sunflowers into regular plants.
2015-02-04 10:38:56 +10:30
Zuhayr
7bc70f46b0
Tweaks/fixes for fruit effects.
2015-02-04 10:37:54 +10:30
Zuhayr
4791ef2b74
First pass on xenoflora expansion.
2015-02-04 10:37:37 +10:30
Kelenius
9edb5751fb
Adds tobacco and maps in drying racks
2015-02-03 22:24:49 +03:00
Kelenius
536388978f
Conflict fix
2015-02-03 20:57:16 +03:00
Kelenius
0e7ed6aef4
Merge branch 'dev' into ofDryingAndRacks
2015-02-03 20:51:27 +03:00
GinjaNinja32
fa75cb9fab
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
2015-02-03 15:23:48 +00:00
Chinsky
74df9669a0
Merge pull request #7719 from Zuhayr/species_tweaks
...
Species tweaks.
2015-02-03 18:11:18 +03:00
PsiOmega
a57cd8c380
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-03 14:51:54 +01:00
volas
ea8e848463
copytext() check for some input
2015-02-01 23:16:04 +03:00
PsiOmega
6fabf503e1
Merge remote-tracking branch 'upstream/master' into dev
2015-02-01 17:39:19 +01:00
Kelenius
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
Zuhayr
8756bb99bd
Adds species-specific comfort tweaks, skrell nutrition changes.
2015-01-20 19:12:35 +10:30
Kelenius
5f496524d2
Changes how sprays work and re-adds silicate
...
Sprays will spray directly at solid objects if they are clicked (walls,
windows, etc).
Makes removal of wall rot with plant-b-gone actually work.
Re-adds silicate with the old recipe. It repairs windows and makes them
more damage-resistant up to half damage taken.
2015-01-17 19:11:41 +03:00
Kelenius
6f7a7177f2
Adds drying racks and updates pipes
...
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +03:00
Zuhayr
c49cb0c645
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2014-12-24 22:43:10 +10:30
Zuhayr
591fc164de
Updating rack paths to match previous commit.
2014-12-24 12:26:43 +10:30
Zuhayr
cc00fa3d52
Fixes and tweaks to the previous.
2014-12-23 22:03:02 +10:30
Zuhayr
bbfc6db0a3
Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)
2014-12-23 17:38:05 +10:30
sabiram
953f365292
Adds 'me' hotkey again. Pedantic spelling changes.
2014-12-12 15:44:22 -05:00
Zuhayr
bc394b72d6
Fixes diona and simple_animals eating snacks.
2014-12-09 22:14:41 +10:30
PsiOmega
957ff8314d
Cargo can now order empty blood packs.
2014-11-30 16:45:52 +01:00
PsiOmega
7386a881d7
Merge remote-tracking branch 'upstream/master' into dev
2014-11-25 10:33:47 +01:00
Zuhayr
a63ec86871
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-11-24 08:58:30 +10:30
GinjaNinja32
fbce3cba4b
Fix neaera cubes, change monkeycube eat varfind method to not create nullspace monkeys
2014-11-23 18:57:42 +00:00
Zuhayr
5568ed15c1
Randomizes strange seed icons, fixes poppies.
2014-11-23 10:15:15 +10:30
Zuhayr
2b4cd94650
Merge resolution.
2014-11-19 23:28:09 +10:30
Zuhayr
425aaf1cba
Merge pull request #7047 from mwerezak/sliceable
...
Fixes inverted slicing check
2014-11-19 23:13:16 +10:30
mwerezak
3a83a31440
Merge remote-tracking branch 'upstream/dev' into sliceable
...
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm - caused by whitespace :/
2014-11-16 22:25:50 -05:00
