Raptor1628
ba12d87388
ERT Update
...
Bevy of ERT changes and updates, outlined in a forum thread here:
2014-11-13 01:28:15 -05:00
Chinsky
b964526aa2
Merge pull request #6980 from MagmaRam/drinks
...
Some new drinking glass icons
2014-11-12 23:45:07 +03:00
Zuhayr
b4ea25d064
Merge conflict resolution.
2014-11-10 13:00:06 +10:30
MagmaRam
08c87edd46
Changed glass to cup for tea and coffee to make the sprites more consistent.
2014-11-09 20:00:17 -05:00
MagmaRam
4815bba8fb
Adds sprites for lemon-lime soda, grape soda in a glass, and coffee.
2014-11-09 19:45:53 -05:00
Chinsky
90cb5f5363
Merge pull request #6962 from GinjaNinja32/drinks
...
Move glass appearance into reagent datums
2014-11-08 11:10:48 +03:00
Chinsky
4230a20c45
Merge pull request #6963 from mwerezak/sliceable
...
Rewrites food slicing, energy weapons
2014-11-08 11:07:34 +03:00
mwerezak
cc82a47163
Cleans up food slicing
2014-11-07 00:10:49 -05:00
mwerezak
81f8f36874
Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.
2014-11-06 19:50:40 -05:00
GinjaNinja32
7d453ece1f
Move glass appearance into reagent datums
2014-11-06 23:49:07 +00:00
GinjaNinja32
0e41cf9cf0
Fixes Toxins Special having no sprite
2014-11-06 21:04:14 +00:00
Chinsky
8078ffe079
Merge pull request #6939 from PsiOmegaDelta/VerbOptimization
...
Verb optimization
2014-11-05 23:23:56 +03:00
PsiOmega
bc438e21ad
All the relevant examine changes.
2014-11-05 12:44:23 +01:00
mwerezak
5372b526a1
Merge remote-tracking branch 'upstream/dev' into fire-extinguishers
2014-10-31 20:29:00 -04:00
mwerezak
e549a22bba
Removes world print, re-adds react() call
...
Also removes checks for if(W.reagent) in extinguisher code, as that is
being handled separately.
2014-10-28 22:13:42 -04:00
mwerezak
85fb8d917c
Sleepers now use power when synthesizing chemicals
...
Also, sleeper and chemmaster power usage are now both controlled by a
constant in setup.dm
2014-10-26 15:10:37 -04:00
mwerezak
a0b47ce4de
Water cools hot turfs even if they do not have a hotspot.
...
Also adjusts fire extinguisher volumes to correspond to the new beaker
volumes, and scales things accordingly.
2014-10-24 21:45:02 -04:00
Graham Lloyd
c764a94073
fixes some annoying punctuation errors.
2014-10-22 15:58:27 -04:00
Zuhayr
d0b3a3a39b
Merge pull request #6601 from Mloc/bs12-calert
...
donut boxes now update their icon to properly reflect their contents
2014-10-06 19:37:24 +10:30
Mloc
9faec14707
donut boxes now update their icon to properly reflect their contents
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-05 19:24:30 +01:00
Zuhayr
6c96f3d66b
Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev
2014-10-02 02:39:37 +09:30
Zuhayr
305416d5c5
Merg resolution.
2014-10-02 02:33:06 +09:30
Mloc
61394d3921
fixes #6561
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-09-30 22:18:25 +01:00
Mloc-Argent
6fb1667b44
fixes #4742
...
not a full fix, there's too many small cases where OPENCONTAINER
isn't checked, but this is everything in the report
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-09-30 20:52:00 +01:00
Zuhayr
b4646b65e8
Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks.
2014-09-30 14:09:41 +09:30
Zuhayr
74eae5a6bd
Moved radiation and light processing to organs.
2014-09-30 11:58:40 +09:30
Zuhayr
9fcde12b4f
Organ rewrite mapclean attempt.
2014-09-29 06:18:58 +09:30
Zuhayr
cc52be3192
Merge resolution, replaced 2 wires lost in map merge.
2014-09-25 23:54:24 +09:30
Zuhayr
b78e2b0c79
Fixes #6297
2014-09-25 21:49:20 +09:30
Zuhayr
7682711442
Fixes #6474
2014-09-25 18:45:27 +09:30
Zuhayr
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
Zuhayr
afde93e94d
Adds random seeds to Cargo for Xenobotany.
2014-09-18 16:39:44 +09:30
RavingManiac
3bcaa1447c
Fixed description error in cryo beakers.
...
Chem dispenser dispenses 40 units instead of 50 units so as to work well with 120-unit large beakers.
2014-09-17 00:51:33 +08:00
sick-trigger
997e00f332
Soda can transfering fix
2014-09-15 17:04:30 +10:00
RavingManiac
d91d5aad0b
Reagent overlays for bottles from the Chem Master.
...
Chemistry containers now have capacities in multiples of 60 (60 for bottles, pills and small beakers, 120 for large beakers and buckets) to make reactions more convenient.
2014-09-14 22:19:39 +08:00
D Anzorge
697d8d5b35
Add grape juicing to reagent grinder
2014-09-07 10:36:43 -04:00
Kelenius
505f857eb8
Stack update
2014-09-02 09:59:32 +04:00
Zuhayr
772715f2da
Merged dev-freeze into master. Two map conflicts, used dev-freeze map.
2014-08-27 20:46:04 +09:30
Zuhayr
cf68ad7c87
Master to dev merge.
2014-08-27 20:24:07 +09:30
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
LightningIron
7de4825a87
Changes some messages to make more sense
2014-08-24 14:09:39 -05:00
PsiOmega
f19001feb8
Renames anti-toxin bottles to dylovene. Soporific tossed out. Sleep toxin renamed to Soporific.
...
Based on http://baystation12.net/forums/viewtopic.php?p=237269#p237269
2014-08-23 17:22:04 +02:00
mwerezak
ababfc1d0c
Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
2014-08-22 01:24:34 -04:00
mwerezak
1477fe17ab
Fixes apply_effect() used without armour checks
2014-08-22 00:02:50 -04:00
Walter0o
1d9d9f7650
should fix #6099
2014-08-22 00:52:19 +02:00
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
igalan
d4be0bfc87
Removed pure laziness comment line
2014-08-21 02:46:18 +01:00
igalan
031d5070fc
Cleans up chem dispenser code by taking out the unused broken_on_spawn var. And frankly, if we wanted that feature, it would be done in other way.
2014-08-21 01:02:54 +01:00
Whitellama
7ced8104ca
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/game/objects/items/devices/transfer_valve.dm
2014-08-17 17:50:07 -07:00
Whitellama
09907858f3
Added fingerprints and logs when wrenching fuel tanks, and added JMP buttons to logs regarding fuel tanks.
2014-08-17 15:51:01 -07:00
