Datraen
beda3185eb
Reverts the second mob clean up because of incomplete implementation.
...
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Kelenius
98badae45f
Merge branch 'master' into cleanupTwo
2016-04-21 11:41:32 +03:00
Kelenius
df5a0d7941
Mob inventory cleanup
...
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Kelenius
3fdda5e8c5
Fixes issues travis found
2016-03-11 11:59:51 +03:00
Hubblenaut
e5de78b647
Adds coffee dispenser
2016-01-02 15:32:48 +01:00
GinjaNinja32
e068a689e3
tweak power cost
2015-12-14 23:13:17 +00:00
GinjaNinja32
53905d3669
add chemical regeneration to cartridge dispensers, remove energy dispensers
2015-12-14 23:01:45 +00:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Neerti
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
fc4c1d6af7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
PsiOmegaDelta
2fcaaf80c7
Chemistry machinery fixes.
...
Makes Topic() calls check parent. Adds proper operable() checks where applicable.
Makes the interact_offline only affect the NOPOWER flag.
Fixes #11116 . Fixes #11302 .
2015-10-15 11:31:57 +02:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
Neerti
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
PsiOmega
3a08e2884a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/largecrate.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
mwerezak
133bc96344
Fixes #10645
...
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
Neerti
f445d6d126
Moves the energy chemical dispenser and cartridge chemical dispenser under one common object. Fixes the map due to type path changes.
2015-07-26 23:20:42 -04:00
Neerti
7a22829ee9
Revert "Replaces gaseous reagents with organic chemistry ones."
...
This reverts commit aa22f7307a
2015-07-26 22:43:40 -04:00
Neerti
045c7323a0
Begins work on removing the chemistry changed introduced from bay.
2015-07-26 22:01:35 -04:00
PsiOmegaDelta
2c8c9df9d2
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-06-02 13:35:02 +02:00
GinjaNinja32
5ebece6368
Spawn fixes
...
Fixes spawning a chem dispenser spamming the log with label settings
Fixes Spawn-Fruit and Spawn-Plant not being usable from hotbar
Fixes Spawn-Fruit and Spawn-Plant not producing admin logs (file only)
Allows spawning dispenser cartridges with different sizes and reagents
2015-06-02 02:24:32 +01:00
PsiOmega
62185bc0a8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-26 08:35:32 +02:00
GinjaNinja32
3fb3a18f05
Supply shuttle and crate fixes
...
- Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes
- Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly
- Non-secure reagent cartridge crates no longer use secure crates
- Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away
- Possibly more I can't remember
2015-05-23 16:15:04 +01:00
Techhead0
aa22f7307a
Replaces gaseous reagents with organic chemistry ones.
...
Hydrogen, Oxygen, Nitrogen, Chlorine, and Fluorine have been replaced with Hydrazine, Acetone, Ammonia, and Hydrochloric Acid.
The new chemicals have been given appropriate effects and integrated into hydroponics.
Flammable liquids have higher touch_met so they don't take forever to build fire stacks.
Liquid phoron now contaminates clothing and burns eyes when splashed on mobs.
2015-05-19 09:32:24 -04:00
GinjaNinja32
400440f077
Fixes #8700
2015-04-01 07:47:15 +01:00
GinjaNinja32
2f4a4a6a6c
Remove medicine crate and medicine cartridge crates
2015-03-16 21:24:30 +00:00
GinjaNinja32
30cfa30c73
Absolute paths
2015-03-02 02:38:12 +00:00
GinjaNinja32
c3388020ff
Reagent dispenser rework
2015-03-02 02:25:32 +00:00
