Commit Graph

17351 Commits

Author SHA1 Message Date
mwerezak
8d1a92a0f5 Hardsuit tweaks
Spider fang blade uses power faster.
Light hardsuits (minus ninja suit) have voidsuit-level breach thresholds.
If the suit is malfunctioning when it runs out of power then you will need someone to cut you out.
2015-02-28 14:04:53 -05:00
mwerezak
a026922115 More hardsuit fixes, ion rifle fix
Fixes modules being usable when destroyed.
Fixes charge display for fractional charge values.
Fixes ion rifles EMPing themselves.
2015-02-28 04:15:29 -05:00
mwerezak
7dd82f8763 Merge remote-tracking branch 'upstream/dev-freeze' into backup
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
2015-02-28 03:39:38 -05:00
mwerezak
55a3b94995 Hardsuit adjustments, fixes
Default inherited offline_slowdown set to 3, as most hardsuits use this
value. ERT no longer get rad immunity, they have enough advantages -
instead only ERT engineers get that.
ERT engineer gauntlets are also now insulated, allowing them to do
wiring work in space.
Fixed a compile error.
Fixed mounted laser cannons taking too long to recharge.
2015-02-28 03:36:00 -05:00
mwerezak
a8c315ad52 Updates rig emp_act
EMPing hardsuits drains a bit of charge. Module damage is dealt to
damaged modules first. Various other adjustments.
2015-02-28 03:17:47 -05:00
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
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
234273605e Merge pull request #8271 from PsiOmegaDelta/AlertMe
Fixes #8266.
2015-02-26 16:28:26 +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
d06b2a0a12 EMP briefly blocks switching/engaging modules 2015-02-26 00:05:04 -05:00
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
PsiOmega
768faa4bf0 Fixes #8266.
Ensures drones get access to the alarm monitor subsystem.
Restores the Show Alerts link in alarm notices.
2015-02-25 09:07:04 +01:00
PsiOmegaDelta
51b722485a Merge pull request #8259 from mwerezak/gun-rewrite
Gun fixes
2015-02-25 07:21:29 +01:00
mwerezak
b067b491a4 Returns the laser carbine capacity to 10 2015-02-25 00:15:08 -05: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
ae6466ac45 Examining the Z8 now shows what is loaded in the grenade launcher. 2015-02-25 00:14:02 -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
mwerezak
401709cd23 Merge remote-tracking branch 'upstream/dev-freeze' into gun-rewrite 2015-02-24 20:15:18 -05:00
Snapshot
600f55bdca Merge pull request #8252 from Raptor1628/dev-freeze
Assorted Fixes
2015-02-24 17:08:33 -08:00
mwerezak
5124055663 Fixes #8243
Didn't want to have to generate even more lists so this is what you get.
2015-02-24 19:42:24 -05:00
mwerezak
404c8886da Fixes #8230 2015-02-24 19:37:49 -05: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
Zuhayr
a1afc3a48a Merge pull request #8235 from PsiOmegaDelta/HoldIt
Fixes #8234
2015-02-25 05:45:54 +10:30
PsiOmega
b3b7ed06cd Fixes #8234
Updates a few missed containers to use proper paths.
2015-02-24 14:06:23 +01:00
Neerti
2c8c4a2327 Fixes some misc examine bugs. 2015-02-24 07:42:06 -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
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
391ddd970e Resolves remaining issues with xenohydro PR. 2015-02-24 17:55:39 +10:30
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
mwerezak
4f86f69808 Fixes missing return that made all bullets pass through mobs 2015-02-23 22:28:37 -05:00
Chinsky
b73d541c65 Merge pull request #8155 from PsiOmegaDelta/subsystems
Centralized Alarm Handling
2015-02-24 04:39:48 +03:00
mwerezak
3940c35184 Misc gun tweaks 2015-02-23 18:25:22 -05:00
mwerezak
e540550cff Adds an underslung grenade launcher to the Z8. 2015-02-23 17:56:54 -05: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
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