0bb2cd835c
Merge pull request #8600 from mwerezak/bread-tube
...
Adds bread tube trash item, merc shuttle vendor
2015-03-25 00:54:16 +10:30
1ce81b91b1
Adds bread tube trash item
2015-03-24 04:03:06 -04:00
45f28d5372
Fixes #8485
2015-03-24 13:20:24 +10:30
bf8ad6d585
Rebalanced xenoflora sprites, fixed numerous issues.
2015-03-22 16:13:15 +10:30
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
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
618249131e
Gives more/better comfychair color options. Removes unused icons from objects.dmi.
2015-03-18 00:26:42 -04:00
e600cdbd3b
Fixes #8430
2015-03-17 19:18:30 +10:30
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
00976aea43
Merge pull request #8417 from PsiOmegaDelta/SolidMatter
...
Attemps to fix #8390 + solid bonus
2015-03-10 09:29:04 +10:30
fc985c2a27
Merge pull request #8416 from PsiOmegaDelta/Ninjas
...
Fixes ninja spawn logic.
2015-03-10 09:27:11 +10:30
baed39c263
Attempts to fix persistent station alarms. Makes wardrobes solid.
2015-03-09 20:55:05 +01:00
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
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
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
8f929331d8
Fixes #8343
...
Fuel no longer attempts to spread itself after having been deleted.
2015-03-03 15:33:15 +01:00
0beb6259f6
Partial fix for #8068 .
2015-02-28 17:29:26 +10:30
14321003f1
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2015-02-28 17:04:22 +10:30
4b15f1a249
Fixes #7877
2015-02-28 16:47:41 +10:30
f7983e7732
Merge pull request #8293 from comma/interfacefix
...
Couple fixes
2015-02-28 16:22:36 +10:30
7f01af6b7d
Merge pull request #8297 from PsiOmegaDelta/CameraCoverage
...
Camera coverage fixes.
2015-02-27 13:11:21 +03:00
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
9e07708cb3
Fixes #8241 rollerbeds not collapsing due to a runtime
2015-02-26 14:41:31 +03:00
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
100d8e9fb8
Fixed buckling into chair not changing mob's facing if he had permafacing set.
2015-02-26 12:09:23 +03:00
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
bceb01c233
Merge pull request #8290 from mwerezak/gun-rewrite
...
Fixes captain's laser gun
2015-02-26 16:28:43 +10:30
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
f4f54dfed1
Fixes action figures not randomizing properly.
2015-02-25 21:52:36 -06:00
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
51b722485a
Merge pull request #8259 from mwerezak/gun-rewrite
...
Gun fixes
2015-02-25 07:21:29 +01:00
9782140d32
Resolves #8236
...
Lasers deal more damage to grilles, and clicking directly on the grille
makes it more likely for the grille to absorb the projectile.
2015-02-25 00:14:42 -05:00
3e71802a52
Replaces colt signal pistol with a Mk58 version.
...
Makes more sense for the HoP, and ensures the colt remains more of a
detective signature item.
2015-02-24 21:23:19 -05:00
600f55bdca
Merge pull request #8252 from Raptor1628/dev-freeze
...
Assorted Fixes
2015-02-24 17:08:33 -08:00
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
24dacf0169
Merge pull request #8227 from PsiOmegaDelta/Syndicate
...
Fixes #8223 .
2015-02-25 05:46:20 +10:30
afb7f7eff7
Fixes #8223 .
...
Restores a lost, somewhat important, line.
Fixes a duplicate uplink item reference.
2015-02-24 12:27:03 +01:00
917bad5d5b
Removes all the fun from buckling.
2015-02-24 06:15:44 -05:00
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
09f15f98f2
Merge pull request #8215 from GinjaNinja32/language
...
Fixes a few issues with noise-language.
2015-02-24 07:49:37 +10:30
e47c45591c
Fixes a few issues with noise-language.
2015-02-23 18:58:41 +00:00
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
5be726753f
Updates paths after the projectile update. Adds rig modules to the uplink.
2015-02-23 17:33:12 +01:00
b5dda2b793
Merge pull request #8180 from mwerezak/mercenary
...
Map updates and fixes, plus hardsuit icons
2015-02-23 15:27:35 +03:00
bbbde676d5
Merge pull request #8200 from mwerezak/devfixes
...
Misc dev updates
2015-02-23 10:15:42 +01:00
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
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
c317fb8c39
Adds ability for uplink purchases to produce more than one item
2015-02-22 20:17:18 -05:00
79917d57b2
Merge pull request #8187 from PsiOmegaDelta/SyndicateDescriptions
...
Rudimentary uplink descriptions.
2015-02-22 11:32:49 +03:00
28e7411e2d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-22 16:28:06 +10:30
Zuhayr