Zuhayr
bc394b72d6
Fixes diona and simple_animals eating snacks.
2014-12-09 22:14:41 +10:30
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
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
mwerezak
2e222523e1
Fixes inverted slicing check
2014-11-16 22:13:17 -05:00
Zuhayr
31b6cc19ad
Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.
2014-11-13 21:41:02 +10:30
Zuhayr
90d65aed57
Removed attack_paw, attack_animal and attack_slime.
2014-11-13 17:15:29 +10:30
Zuhayr
b4ea25d064
Merge conflict resolution.
2014-11-10 13:00:06 +10:30
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
PsiOmega
bc438e21ad
All the relevant examine changes.
2014-11-05 12:44:23 +01: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
9fcde12b4f
Organ rewrite mapclean attempt.
2014-09-29 06:18:58 +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
sick-trigger
997e00f332
Soda can transfering fix
2014-09-15 17:04:30 +10: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
mwerezak
1477fe17ab
Fixes apply_effect() used without armour checks
2014-08-22 00:02:50 -04:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Whitellama
dad248d49d
Fixed #5870 : Glasses being labeled both 'glass' and 'Drinking glass' inconsistently
2014-08-01 16:39:19 -07:00
Zuhayr
ad8ef7c4ab
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-28 20:59:29 +09:30
Loganbacca
4861c5a5d4
Grammar tweak
2014-07-28 07:38:24 +12:00
Loganbacca
fbc9b03e73
Cup fix
...
- Grammar fix for drinking from cups
- Changed "Glass of Tomato juf" to "Glass of Tomato juice" (I'm assuming this was a typo)
2014-07-27 20:04:45 +12:00
Zuhayr
d8336061b4
Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev
2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e
Merge resolution with PDA nanoui.
2014-07-25 22:57:53 +09:30
Zuhayr
ea8b08c49b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b
Hydroponics rewrite, details will be in PR. Big commit.
2014-07-25 22:16:04 +09:30
Mloc-Argent
d5e9851b62
integrate XGM into the code
...
New turf proc: assume_gas(). Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
more.
Zones now process all fire data and existance in one go, fire objects
only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
structured for the new gas_mixtures.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 19:52:12 +01:00
Hubblenaut
52c0d83a2c
Cans now actually make use of the new 4x4 grid
2014-07-21 12:08:50 +02:00
Whitellama
eb2ec42345
Fixed #5697 , grammatical error with empty glasses, cans, condiment containers
2014-07-19 16:22:09 -07:00
Ccomp5950
67bf27e6f4
Merge pull request #5602 from Hubblenaut/food
...
Grid Placement for Food
2014-07-15 01:22:47 -05:00
Hubblenaut
c920b0234f
Renames CoM into center_of_mass
2014-07-14 23:13:46 +02:00
Whitellama
a6b4f5d2aa
Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans
2014-07-13 23:23:26 -07:00
Hubblenaut
b7778ff420
Fixes merge conflict
2014-07-13 21:35:31 +02:00
Hubblenaut
31637edf76
Introduces function for exact item placement of food and applies it to each food item in the game
2014-07-13 19:37:33 +02:00
Hubblenaut
dfece9fe12
Stops buckled mobs from slipping (for now)
2014-07-02 22:36:49 +02:00
Mloc-Argent
6630e4838e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/alarm.dm
2014-06-30 23:44:46 +01:00
Ccomp5950
1ba345ca8c
Teacup icon clipping fix.
...
Might need to be done to coffee as well.
Thanks Serveris6 for the report: http://prntscr.com/3wyah5
2014-06-27 02:29:45 -05:00
Chinsky
4cd4217488
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge
...
Conflicts:
code/modules/organs/organ_external.dm
2014-06-24 04:22:28 +04:00
