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
mwerezak
2e222523e1
Fixes inverted slicing check
2014-11-16 22:13:17 -05:00
Amunak
4a845beb7d
corrects volume shown in description of beakers
2014-11-16 20:33:25 +01:00
Zuhayr
4d64a11acd
Manual merge of head.dmi.
2014-11-14 23:02:16 +10:30
Zuhayr
ebbb9b36b5
Moved everything to a module-based hardsuit system.
...
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
2014-11-14 22:57:26 +10:30
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
cc52be3192
Merge resolution, replaced 2 wires lost in map merge.
2014-09-25 23:54:24 +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
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
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
Whitellama
f1494c9b76
Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them.
2014-08-17 02:48:08 -07: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
251b44a53c
Changed hydro trays, fertilizer and syringes over to use the reagent procs.
2014-07-30 12:24:03 +09:30
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
4ef8a08310
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
2014-07-27 03:20:16 +09:30
