igalan
eee72ce802
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydro_refactor
2014-06-11 03:45:00 +01:00
igalan
7d08d4701c
Hydroponics refactor, part 1: Files.
...
No code actually modified, just moved from all over the place to a module folder.
defines/obj/hydro.dm split:
-Seeds into seeds.dm
-Tools like the analyzer, pest and weedkillers into hydro_tools.dm. Hatches and scythe from defines/obj/weapon.dm moved there too.
-Non-edible plants like nettles into grown_inedible.dm. Special procs in items/weapons/hydroponics.dm moved there.
-Biogenerator and hydroponics tray files moved.
2014-06-11 03:44:29 +01:00
Zuhayr
c841db56b6
Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-11 09:24:28 +09:30
mwerezak
a8816823a5
Replaces get_turf_loc() with get_turf()
...
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
2014-06-10 13:43:11 -04:00
Zuhayr
9e7fe6d700
Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.
2014-06-11 01:14:38 +09:30
Zuhayr
c3c6f72147
More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.
2014-06-08 01:39:49 +09:30
Zuhayr
78918e4795
Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.
2014-06-08 00:52:20 +09:30
Zuhayr
c2f2a7cde6
Refactored material definitions a little bit, removed all bananium from the codebase.
2014-06-08 00:40:34 +09:30
Zuhayr
95a6f9d613
First pass on ore distribution map and stationary drilling rig.
...
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.
2014-06-07 23:07:49 +09:30
Hubblenaut
5098c6a85c
Makes crashing into things possible with extinguisher or harm intent
2014-06-05 22:49:38 -04:00
sick-trigger
2df8eca7cb
Health analyzers display blood type
...
Saves having to mess around with your PDA during a crisis (not really,
just grab that O- bag)
2014-06-05 18:09:31 +10:00
Loganbacca
7d7d095e5c
New vehicle framework
...
- Implements a new vehicle framework
- Adds cargo trains
2014-06-03 22:18:49 +12:00
mwerezak
a6bc516313
Readds flashes to all robots except drones.
...
Drones also get a special low-power flashlight, now.
2014-06-02 23:05:37 -04:00
Zuhayr
1e135f91af
Merge resolution with master.
2014-06-02 12:05:12 +09:30
Chinsky
82b6e76d4c
Merge pull request #5086 from UristMcKerman/spam-filter
...
Spam filter
2014-06-01 20:09:06 +04:00
Zuhayr
a7c3c67da8
Fixes #5098
2014-06-01 21:09:30 +09:30
Mloc-Argent
ee2e68960a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/cloning.dm
code/modules/admin/admin_verbs.dm
2014-05-31 00:17:56 +01:00
UristMcKerman
e37a70089b
Tweaks for spam #2
...
Added brackets surrounding tokens to make whitespace and empty tokens
removable.
Slightly modified ion storm behavior.
Increased duration required to stop spam to 5 minutes.
Added ability to expand spam filter limit with installation of message
monitor circuits.
People will see why their message been discarded.
Discarded messages will be highlighted with red color in message log.
2014-05-29 16:05:00 +04:00
UristMcKerman
0a0ce28f68
Added spam filter
...
Added spam filter functionality to message server and message server
monitor.
2014-05-28 17:12:18 +04:00
Zuhayr
a29861480a
Fixes #5023
2014-05-28 16:35:06 +09:30
Ccomp5950
4bb59352f5
Merge pull request #4968 from MrLeebo/mutiny
...
Mutiny Mode
2014-05-28 00:13:42 -05:00
Zuhayr
3b3bd5649d
Merge pull request #5024 from Jarcolr/Cargo
...
Adds 21 new crates and a tweak
2014-05-28 01:21:24 +09:30
Jarcolr
049b9cc447
Fixes and a suggested change
...
Fixed N2O typo, Super Pacman, anchor issues, inflatable barrier issues
that was already on master so this doesn't conflict, and added a new box
for shotgun shells and adjusted price of crates accordingly
2014-05-27 17:15:17 +03:00
Zuhayr
4538fbabca
Lots of work on hardsuits, commented out some broken WIP code, did some renaming, deleted now-redundant species-specific hardsuits.
2014-05-27 01:18:07 +09:30
Jeremy Liberman
d3541d1e08
Merge branch 'dev' into mutiny
2014-05-25 14:22:16 -05:00
Ccomp5950
ff0d667337
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
2014-05-24 19:02:16 -05:00
Ccomp5950
3b8ee547c6
Merge pull request #5046 from mwerezak/lightbulb-box
...
Fixes #5043
2014-05-23 17:51:05 -05:00
mwerezak
c4e811829e
Fixes #5043
2014-05-22 18:47:38 -04:00
mwerezak
71ad2b3aae
Fixes bodybags not being able to be put back...
...
...into their own box. Also affects folded cryobags.
2014-05-22 16:44:26 -04:00
Jeremy Liberman
a95a28e303
Merge branch 'dev' into mutiny-fixes
2014-05-18 11:25:36 -05:00
Mloc-Argent
e24dd57a65
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/life.dm
2014-05-14 22:42:03 +01:00
Zuhayr
ce4f7d4708
Fixes #4979
2014-05-14 17:02:04 +09:30
bs12-bot
1f614c3149
Merge pull request #4971 from Ravensdale/and_yeah_he_doth_spake-let_there_be_light
...
Fixes runtime with yellow slime extracts.
2014-05-12 19:02:31 +01:00
Ccomp5950
bc21d1734c
Merge pull request #4962 from mwerezak/internal-storage-ground-fix
...
Internal storage fix
2014-05-12 11:41:48 -05:00
Ravensdale
8e15a76da1
Fixes runtime with yellow slime extracts.
2014-05-12 01:15:45 -07:00
Jeremy Liberman
d23340a49b
Mutiny Mode
2014-05-11 15:03:50 -05:00
Mloc-Hibernia
f2924c9f57
Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons
2014-05-11 13:48:51 +00:00
Mloc-Hibernia
e3a8d5eb43
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Loganbacca
f32d281132
Compressed matter implanter fix
...
Compressed matter implanters will now correctly remove the compressed item from the game world if it is in an inventory (player or storage container).
2014-05-11 18:30:18 +12:00
Mike
cee43ffbf3
Fixes internal storage on ground
...
Fixes not being able to remove items from internal storage when the
master item is on the ground.
2014-05-10 23:41:48 -04:00
Zuhayr
5e682668b2
Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
2014-05-10 02:10:06 +09:30
Zuhayr
1fc3ecf145
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36
Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
2014-05-10 01:40:11 +09:30
Zuhayr
9f2f5fb488
Fixes #4808
2014-05-10 00:30:03 +09:30
Mloc-Argent
a2b85c31a4
Merge remote-tracking branch 'upstream/master' into dev
2014-05-07 17:37:29 +01:00
Zuhayr
a1f6b7a211
Merge pull request #4885 from mwerezak/equipment-fixes
...
Misc Equipment fixes - Mostly hardsuits
2014-05-07 09:59:44 +09:30
Mloc-Argent
6a11ca32f8
Merge remote-tracking branch 'upstream/master' into dev
2014-05-05 22:22:01 +01:00
Ccomp5950
3739ed03ff
Merge pull request #4905 from Jarcolr/properhudobject
...
Cyborg hud modules now have proper icon states
2014-05-04 09:36:32 -05:00
Jarcolr
e050251c81
Cyborg hud modules now have proper icons
...
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png
2014-05-04 16:06:10 +03:00
Jarcolr
5bc9ea47e4
Added storage/misc for objs that don't fit in
...
Also moved the dicepack there.
2014-05-04 00:40:08 +03:00
