Chinsky
d2518798ec
Merge pull request #8486 from PsiOmegaDelta/NanoLaws
...
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
Chinsky
158a2731e3
Merge pull request #8335 from GinjaNinja32/reagent_dispenser
...
Reagent dispenser rework
2015-03-17 10:05:18 +03:00
PsiOmega
7f68403ae4
NanoUI - Silicon law manager
...
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
GinjaNinja32
458970a617
Merge remote-tracking branch 'upstream/dev' into reagent_dispenser
2015-03-16 21:21:56 +00:00
Techhead0
2ca80a06b9
Botany tool construction and clippers
...
Adds hatchets and mini hoes to the autolathe recipe list. Material costs
are unchanged. Also adds plant clippers (reskinned wirecutters) to
secure hydroponics lockers.
2015-03-15 19:15:35 -04:00
Techhead0
020e1e4c60
Tweaks.
...
Regeneralizes sunglasses. Adds plant analyzer and megaphone. Puts EMT gear under general medical.
2015-03-14 15:52:29 -04:00
Techhead0
d4e46182af
More things in belts.
...
I widened the selection of things you can put in various belts. Most
notably, emergency gear in medical belts and botany gear in tool belts.
2015-03-14 14:38:30 -04:00
PsiOmega
ce30b00287
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
icons/mob/items_righthand.dmi
maps/exodus-1.dmm
maps/exodus-5.dmm
2015-03-13 09:23:26 +01:00
PsiOmega
533ccef0ab
Robot code clean up and fixes.
...
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
Zuhayr
00976aea43
Merge pull request #8417 from PsiOmegaDelta/SolidMatter
...
Attemps to fix #8390 + solid bonus
2015-03-10 09:29:04 +10:30
Zuhayr
fc985c2a27
Merge pull request #8416 from PsiOmegaDelta/Ninjas
...
Fixes ninja spawn logic.
2015-03-10 09:27:11 +10:30
PsiOmegaDelta
668c4baee7
Merge pull request #8382 from comma/monkey_revenge
...
Allows you to scoop monkeys up
2015-03-09 21:17:03 +01:00
PsiOmega
baed39c263
Attempts to fix persistent station alarms. Makes wardrobes solid.
2015-03-09 20:55:05 +01:00
mwerezak
b9d2517d83
Tweaks random gun spawners and supply packs
...
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
2015-03-09 15:47:25 -04:00
PsiOmega
57c0591283
Fixes ninja spawn logic.
...
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
2015-03-09 19:22:07 +01:00
Chinsky
d8c2a36f9f
Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance
...
Mirror and ERT appearance improvement.
2015-03-09 13:42:19 +03:00
mwerezak
b71f6c1121
Partial breathing refactor
...
Reorganizes breathing, and moves common human/monkey breathing code into
carbon. handle_breath() is largely unchanged.
Removes unnecessary handle_internal_lifeform().
Fixes monkies being held by people in mecha in space not being able to breathe.
2015-03-09 00:09:34 -04:00
PsiOmega
c6b0370b6a
Mirror and ERT appearance improvement.
...
NanoUI-based appearance changer, with flags to set exactly which parts of the appearance which can be changed.
2015-03-07 23:11:00 +01:00
MrSnapwalk
cb0ec5abe4
Adds 7 new posters.
2015-03-06 21:14:32 -06:00
mwerezak
9f55526bce
Toolboxes can now hold a limited number of w_class 3 items
...
They can hold up to 3 w_class 3 items, or the usual 7 w_class 2 items.
2015-03-05 11:10:26 -05:00
mwerezak
9aed472531
Minor storage cleanup
...
Demotes folding to storage/box, makes doughnut boxes a subtype of box.
Removes a couple of istype() hacks from storage.
2015-03-05 11:08:22 -05:00
mwerezak
3bf5a5ca99
Updates storage costs
...
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
2015-03-05 10:40:25 -05:00
PsiOmega
3e9f33136a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/effects/decals/Cleanable/fuel.dm
maps/exodus-5.dmm
2015-03-05 09:20:20 +01:00
Raptor1628
cf0e526d91
Fixes and adjustments
...
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
2015-03-04 11:18:40 -05:00
PsiOmega
8f929331d8
Fixes #8343
...
Fuel no longer attempts to spread itself after having been deleted.
2015-03-03 15:33:15 +01:00
Chinsky
81a9f87ad7
Merge pull request #8336 from mwerezak/liquidfire
...
Implements liquid fuel fires
2015-03-03 10:31:49 +03:00
Chinsky
ca0f08c30a
Merge pull request #8331 from PsiOmegaDelta/PDATrack
...
The AI now have the ability to track senders of PDA messages.
2015-03-03 10:21:06 +03:00
mwerezak
49b3db964f
Implements fuel fires
...
Implements liquid fuel fires using the liquid fuel cleanable decal objects.
Rewrites zburn to be more sane, replaces convoluted calculations with straightforward reaction limit.
Fixes issue with liquid fuel spreading caused by thee object being deleted.
Prevents zones from being repeatedly added to the active fire zones list, and processed repeatedly.
2015-03-02 12:40:01 -05:00
GinjaNinja32
c3388020ff
Reagent dispenser rework
2015-03-02 02:25:32 +00:00
PsiOmega
02a1e1d129
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/light.dm
2015-03-01 21:15:47 +01:00
PsiOmega
b82df37159
The AI now have the ability to track senders of PDA messages.
...
Can only track the original owner of a PDA.
Cannot track the senders/receivers of intercepted messages.
All other tracking conditions apply (camera coverage, no agent ID, etc.).
2015-03-01 20:55:27 +01:00
Zuhayr
64b33c43db
Refactors some job variables from the Economy file (what the fuck) and swaps created types for lists in bot access assignment.
2015-02-28 20:20:19 +10:30
Zuhayr
0beb6259f6
Partial fix for #8068 .
2015-02-28 17:29:26 +10:30
Zuhayr
14321003f1
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2015-02-28 17:04:22 +10:30
Zuhayr
4b15f1a249
Fixes #7877
2015-02-28 16:47:41 +10:30
Zuhayr
f7983e7732
Merge pull request #8293 from comma/interfacefix
...
Couple fixes
2015-02-28 16:22:36 +10:30
Chinsky
7f01af6b7d
Merge pull request #8297 from PsiOmegaDelta/CameraCoverage
...
Camera coverage fixes.
2015-02-27 13:11:21 +03:00
PsiOmega
2c032cacaf
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-27 09:52:51 +01:00
PsiOmega
7e498e1cf7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/hydroponics/seed_datums.dm
code/modules/hydroponics/trays/tray_apiary.dm
code/modules/power/apc.dm
code/setup.dm
2015-02-27 09:06:48 +01:00
Chinsky
9e07708cb3
Fixes #8241 rollerbeds not collapsing due to a runtime
2015-02-26 14:41:31 +03:00
PsiOmega
98f6a4cae5
Camera coverage fixes.
...
Fixes issues with AI cameras coverage not updating properly in several instances during EMPs, destruction, etc.,
2015-02-26 11:39:41 +01:00
Chinsky
100d8e9fb8
Fixed buckling into chair not changing mob's facing if he had permafacing set.
2015-02-26 12:09:23 +03:00
PsiOmega
e7653e1ed5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-26 08:22:25 +01:00
Zuhayr
a9d23df3ff
Merge pull request #8279 from PsiOmegaDelta/CameraNet
...
Fixes camera network changes not always being reflected in camera consoles.
2015-02-26 16:28:49 +10:30
Zuhayr
bceb01c233
Merge pull request #8290 from mwerezak/gun-rewrite
...
Fixes captain's laser gun
2015-02-26 16:28:43 +10:30
Zuhayr
0e80242e92
Merge pull request #8212 from PsiOmegaDelta/CleanTopic
...
Minor NanoUI/Topic cleanup
2015-02-26 16:27:08 +10:30
mwerezak
ec59f8ab07
Fixes captain's laser gun
...
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
2015-02-25 23:35:20 -05:00
MrSnapwalk
f4f54dfed1
Fixes action figures not randomizing properly.
2015-02-25 21:52:36 -06:00
PsiOmega
4dca85b17c
Fixes camera network changes not always being reflected in camera consoles.
...
Cameras with altered networks would not necessarily show up on camera consoles, primarily affecting cameras joining/leaving alarm zones.
2015-02-25 19:50:07 +01:00
PsiOmegaDelta
51b722485a
Merge pull request #8259 from mwerezak/gun-rewrite
...
Gun fixes
2015-02-25 07:21:29 +01:00