Kelenius
78bac425ad
Updates drill and scanner
2015-03-24 18:34:26 +03:00
PsiOmega
2a17d656f2
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-23 11:47:15 +01:00
Zuhayr
bf8ad6d585
Rebalanced xenoflora sprites, fixed numerous issues.
2015-03-22 16:13:15 +10:30
Zuhayr
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
PsiOmega
7ab57a4917
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/fancy.dm
code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
PsiOmega
6e2488ccb0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
2015-03-20 08:26:34 +01:00
PsiOmega
3d9d05afce
Fixes #8107 .
...
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
2015-03-19 21:33:58 +01:00
Chinsky
be8e76a01e
Merge pull request #8535 from Kelenius/ofCandlesAndTime
...
Makes candles last longer
2015-03-19 00:20:07 +03:00
Kelenius
cc9f15dd67
Makes candles last longer
2015-03-18 20:57:51 +03:00
Mandurrrh
618249131e
Gives more/better comfychair color options. Removes unused icons from objects.dmi.
2015-03-18 00:26:42 -04:00
Zuhayr
961272817f
Merge pull request #8461 from comma/biofluff
...
Added support for multiple cloning vats per single console.
2015-03-18 02:55:05 +10:30
Chinsky
d2518798ec
Merge pull request #8486 from PsiOmegaDelta/NanoLaws
...
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
Zuhayr
e600cdbd3b
Fixes #8430
2015-03-17 19:18:30 +10:30
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
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
Chinsky
ba18611bb3
Added support for multiple cloning vats per single console.
...
On spawn, console will attempt to connect to all unconnected cloning vats.
You can change what console connects to which pod with multitool.
2015-03-13 13:21:19 +03: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
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
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
Chinsky
7f01af6b7d
Merge pull request #8297 from PsiOmegaDelta/CameraCoverage
...
Camera coverage fixes.
2015-02-27 13:11:21 +03: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
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
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
Snapshot
600f55bdca
Merge pull request #8252 from Raptor1628/dev-freeze
...
Assorted Fixes
2015-02-24 17:08:33 -08:00
Raptor1628
d4870b80ee
Assorted Fixes
...
Rebalances the random armory so there are always energy weapons,
projectile weapons, and ion weapons. Ammo no longer random. Fixes some
oversights with the EMT area and improves flow. Sec Guns fit in belts.
Fixes typos and a missing price in the vending machine.
2015-02-24 14:40:02 -05:00
PsiOmega
afb7f7eff7
Fixes #8223 .
...
Restores a lost, somewhat important, line.
Fixes a duplicate uplink item reference.
2015-02-24 12:27:03 +01:00
Zuhayr
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
Zuhayr
09f15f98f2
Merge pull request #8215 from GinjaNinja32/language
...
Fixes a few issues with noise-language.
2015-02-24 07:49:37 +10:30
GinjaNinja32
e47c45591c
Fixes a few issues with noise-language.
2015-02-23 18:58:41 +00:00
PsiOmega
b38d8495b3
Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather
...
Conflicts:
code/game/gamemodes/game_mode.dm
code/modules/clothing/spacesuits/rig/suits/merc.dm
2015-02-23 17:38:50 +01:00
PsiOmega
5be726753f
Updates paths after the projectile update. Adds rig modules to the uplink.
2015-02-23 17:33:12 +01:00
mwerezak
6c4d16774f
Merge remote-tracking branch 'upstream/dev' into mercenary
...
Conflicts:
code/game/objects/items/devices/uplinks.dm
2015-02-22 20:44:43 -05:00
mwerezak
115bbbe669
Nerfs merc sniper rifle and makes it uplink purchasable
...
Also reduces the Z8's damage a bit, just to make it more in line with
the new bullet damage ranges.
2015-02-22 20:27:06 -05:00
mwerezak
c317fb8c39
Adds ability for uplink purchases to produce more than one item
2015-02-22 20:17:18 -05:00
Chinsky
79917d57b2
Merge pull request #8187 from PsiOmegaDelta/SyndicateDescriptions
...
Rudimentary uplink descriptions.
2015-02-22 11:32:49 +03:00
Zuhayr
451337476d
Merge with dev.
2015-02-21 20:11:35 +10:30
Zuhayr
0c206344b6
Master<dev
2015-02-21 19:57:31 +10:30
Zuhayr
2ecd76b07f
Master merge.
2015-02-21 19:51:28 +10:30
