Commit Graph

9974 Commits

Author SHA1 Message Date
Zuhayr
92fc2e13e9 Merge pull request #8301 from PsiOmegaDelta/Remapping
Map Changes
2015-02-27 22:44:45 +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
PsiOmega
558701a1bb Map Changes
Corrects multiple camera network issues on the asteroid outpost.
Updates camera consoles on the station accordingly.
Flips a flag for a PSU rack to avoid annoying server start messages.
Adds more signs, markers, etc. for a more living map.
2015-02-27 08:56:00 +01:00
Mustafa Kalash
d258a476f8 Adds paramedic to the medical category. Fixes #8255 2015-02-26 16:37:27 -05: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
f14922f1f8 Merge pull request #8288 from mwerezak/topicfix
Topic Fixes
2015-02-26 16:28:56 +10:30
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
586ab164f8 Merge pull request #8242 from PsiOmegaDelta/StarDimmer
Makes starlight strength configurable.
2015-02-26 16:28:09 +10:30
Zuhayr
55fdf42269 Merge pull request #8216 from PsiOmegaDelta/JukeboxFix
Jukebox fix.
2015-02-26 16:27:28 +10:30
Zuhayr
0e80242e92 Merge pull request #8212 from PsiOmegaDelta/CleanTopic
Minor NanoUI/Topic cleanup
2015-02-26 16:27:08 +10:30
Zuhayr
d98eb1c823 Merge pull request #8289 from MrSnapwalk/actionfigurefix
Fixes action figures not randomizing properly.
2015-02-26 16:26:37 +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
mwerezak
6d15809768 Corrects return values for the Topic procs of several computers and some other machines as well. 2015-02-25 21:32:35 -05: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
PsiOmega
dfd83f787a Fixes #8258.
Main correction is the removal of Topic() in code/game/machinery/computer/computer.dm.
Issue introduced in #7617 where I stated multiple times this Topic()-return value was incorrect.

Ensures that computers return the correct value after the ..() check.
2015-02-25 09:47:50 +01:00
PsiOmegaDelta
51b722485a Merge pull request #8259 from mwerezak/gun-rewrite
Gun fixes
2015-02-25 07:21:29 +01:00
mwerezak
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
mwerezak
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
mwerezak
944be58804 Adjusts sniper rifle damage
Lowers wall pierce chance back to original value to compensate, and
increase the cost of ammo by 1 TC.
2015-02-24 20:45:40 -05: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
Zuhayr
24dacf0169 Merge pull request #8227 from PsiOmegaDelta/Syndicate
Fixes #8223.
2015-02-25 05:46:20 +10:30
PsiOmega
d0aa773020 Makes starlight strength configurable. 2015-02-24 16:12:07 +01:00
Atlantiscze
488c25ae73 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power 2015-02-24 13:09:05 +01: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
Neerti
917bad5d5b Removes all the fun from buckling. 2015-02-24 06:15:44 -05:00
PsiOmega
1fd70d03b1 Fixes Malfuction Turret Upgrade
Now upgrades all portable turrets on the station, instead of turrets found in the player list.
Decreases delays between shots, instead of increasing it, to 66% of original delay.
2015-02-24 08:28:15 +01:00
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
Chinsky
b73d541c65 Merge pull request #8155 from PsiOmegaDelta/subsystems
Centralized Alarm Handling
2015-02-24 04:39:48 +03:00
Zuhayr
09f15f98f2 Merge pull request #8215 from GinjaNinja32/language
Fixes a few issues with noise-language.
2015-02-24 07:49:37 +10:30
PsiOmega
a38dc1e3bf Fixes the Jukebox not dealing properly with areas of different light strengths. 2015-02-23 21:56:35 +01:00
PsiOmega
d8245540ef Restores silicon alarm notices. 2015-02-23 21:29:00 +01:00
PsiOmega
c55f807b42 Removes random Telecrystal grants, instead increases the start amount by 2. 2015-02-23 20:56:48 +01:00
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
PsiOmega
4659415af2 Atmospheric computer NanoUI interface. 2015-02-23 17:14:20 +01:00
Zuhayr
d66f4457a1 Merge pull request #8211 from PsiOmegaDelta/Starlight
Ports /tg/'s starlight luminance.
2015-02-24 02:19:50 +10:30
PsiOmega
f510c38d22 Alarm centralization completion
Atmosphere alarms now handled centrally.
2015-02-23 15:11:13 +01:00
PsiOmega
a2cd104cc9 Alarm centralization completion
Fire alarms now handled centrally.
2015-02-23 13:28:19 +01:00
Chinsky
b5dda2b793 Merge pull request #8180 from mwerezak/mercenary
Map updates and fixes, plus hardsuit icons
2015-02-23 15:27:35 +03:00
PsiOmega
93b049e7a6 Alarm centralization completion
Ensures the master area is always used, to avoid issues caused by dynamic lightning which splits areas into sub-areas.
Power alarms now handled centrally.
2015-02-23 11:23:23 +01:00
PsiOmega
1c763ff2c9 Merge remote-tracking branch 'upstream/dev' into subsystems 2015-02-23 10:32:32 +01:00