Commit Graph

11085 Commits

Author SHA1 Message Date
GinjaNinja32
9667eac972 Merge pull request #10961 from PsiOmegaDelta/150831-OpenFire
Ports the portable turret projectiles to the new system.
2015-08-31 20:57:55 +01:00
Cael Aislinn
8f05e2f63a fixes an obscure runtime in telecomms code
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-08-31 18:57:42 +10:00
Zuhayr
7f97527471 Merge pull request #10581 from Kelenius/ofMechfabAndPanic
Updates mechfab
2015-08-31 17:39:04 +09:30
Kelenius
57ab846273 Merge branch 'dev' into ofMechfabAndPanic
Conflicts:
	maps/exodus-1.dmm
2015-08-31 10:57:04 +03:00
Zuhayr
f86eba984c Merge pull request #10962 from caelaislinn/remote_emitter_fix
Fixes runtime in remote emitter activation button
2015-08-31 17:25:57 +09:30
Cael Aislinn
9f1407c196 fixes runtime in remote emitter activation button
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-08-31 17:45:20 +10:00
PsiOmega
337333d45e Ports the portable turret projectiles to the new system. 2015-08-31 09:10:58 +02:00
Joseph Heinemeyer
8c61c3ab6f Fixes multi-z things. 2015-08-30 18:58:37 -07:00
SkyMarshal
772c320303 Multi-Z. 2015-08-30 14:15:20 -07:00
Neerti
067bfc0de5 Merge pull request #181 from Mark9013100/endondeath0
Rounds no longer end on antag death
2015-08-30 13:11:38 -04:00
PsiOmega
0bd41e604b Merge remote-tracking branch 'upstream/dev' into Backup 2015-08-30 15:55:10 +02:00
PsiOmega
6165b6fee3 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/material/shards.dm
2015-08-30 10:23:14 +02:00
PsiOmegaDelta
88250ad57f Merge pull request #10939 from Baystation12/master
Dev-freeze
2015-08-30 10:20:32 +02:00
Cael Aislinn
d41083cfae resolves issue with space and unsimulated turfs being odd and dark
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-08-30 15:27:04 +10:00
Mark9013100
1d736b368e Rounds no longer end on antag death 2015-08-30 00:52:38 -04:00
PsiOmega
e1aa20fda5 Radio changes.
Removes the radio free range option.
Instead all users can move within the standard radio frequency range, while authorized users can also select department channels.
2015-08-29 17:12:48 +02:00
Atlantis
4189fc3ff6 Adds defines for atmospherics tanks values 2015-08-29 15:53:13 +02:00
PsiOmega
35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
2015-08-29 10:06:18 +02:00
PsiOmega
22262507b9 Only living mobs now trigger shrapnel.
Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all.
On dev this issue is expanded further as all known movements means use forceMove.
2015-08-29 10:03:58 +02:00
Mark9013100
1906000577 Removes duplicate line from detective file 2015-08-28 23:55:52 -04:00
Sligneris
8046fa0fb2 "Junior Officer" alt-title
Adds "Junior Officer" as an alternative job title to Security Officers.

Pros:
- replaces "Security Cadet" as a title that signalizes lesser experience,
- opens up roleplay possibilities,
- gives no potential room for slot abuse,
- gives a reason for a character to make mistakes, allowing for some antag opportunities!

Cons:
- gives a reason for a character to make mistakes.
2015-08-29 02:34:08 +02:00
mwerezak
db8aefb121 Refactors duplicate parry code 2015-08-28 14:39:28 -04:00
Atlantis
601c525a4b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapfixes 2015-08-28 20:38:04 +02:00
PsiOmegaDelta
bf3040cc2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-27 09:01:50 +02:00
PsiOmegaDelta
d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
2015-08-27 08:53:22 +02:00
Atlantis
52d9f0ebc3 Fixes various turf/atmosphere issues
- Fixes the fact atmospherics turfs started with only ~5000kPa of relevant gas in them. This was, espicially with nitrogen, insufficient to cover round usage which is in ten thousands.
- N2 tank starts at 90k kPa, O2 at 50k kPa, CO2 and Phoron tanks at 25k kPa and N2O tank at 10k kPa. This is a combination of original values and minor balancing (O2 and N2 is used in air mix so there's a lot of it, while others are less useful/limited to toxins use so they are likely not needed at such amount). These values were verified in-game and are accurate at 20C the gas mix starts on.
- Engine no longer starts hyperpressurised with nitrogen, in a way that somehow causes it to generate 80kW without anyone touching it at all, while using only 40-50kW for circulation and stuff.
- Engine reverted to 80kPa inert N2 atmosphere that's being used for months now and is on master. Unlike 5MPa nitrogen it doesn't prevent usage of different coolant type, and doesn't overpressurise the core.
2015-08-27 07:40:18 +02:00
HarpyEagle
df3eeb891e Fixes dead people blocking stuff with shields. 2015-08-26 11:51:04 -04:00
mwerezak
fb6b94de87 Incorporates laser reflection into the shield system 2015-08-26 10:39:54 -04:00
mwerezak
0a751322e3 Rewrites shield handling
Rewrites shield handling to be less hardcoded.
Shields now take into account the damage source and direction when blocking.
Riot shields no longer block most bullets, but are better at blocking melee and thrown items than they were previously.
Energy shields block projectiles with a similar probability as they did before, and block melee and thrown as well as riot shields do.
Shields no longer block from directly behind the player.
Weapons now only block melee attacks.
Cool effects when blocking with an energy shield or energy sword (including holoswords).
2015-08-26 10:39:31 -04:00
PsiOmegaDelta
5962656c1e Languages now use alternative prefix keys.
Makes radio and language key overlaps possible.
It is possible to configure the default language keys server side.
Pending: The possibility for players to configure their own language keys.
2015-08-26 13:17:57 +02:00
Zuhayr
a6604b2ca2 Merge pull request #10830 from mwerezak/lighting
Fixes #10465, escape pod lighting and raider spaceacillin
2015-08-26 05:50:37 +09:30
Zuhayr
b7c95f9c00 Merge pull request #10880 from Baystation12/dev-freeze
Dev freeze
2015-08-26 03:22:06 +09:30
Zuhayr
f4d27e8b1c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/admin/verbs/adminsay.dm
2015-08-26 03:09:11 +09:30
PsiOmegaDelta
d02108043c Revert "IAA cartridge tweak" 2015-08-25 12:48:42 +02:00
Kelenius
1ac8b94427 Fixes a few issues with the mechfab, fixes #10852 2015-08-25 12:28:20 +03:00
Zuhayr
9b3d21fe1c Merge pull request #10868 from comma/detrevert
Fixes inconsistency in Detective job datum
2015-08-25 18:27:30 +09:30
PsiOmegaDelta
2fdf859122 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-25 08:20:13 +02:00
PsiOmegaDelta
713a7bd654 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/devices/flashlight.dm
2015-08-25 08:12:39 +02:00
Zuhayr
9087466552 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap 2015-08-25 12:29:59 +09:30
Chinsky
3ccbe22152 Fixes inconsistency in Detective job datum
There was only 1 slot, but you could spawn 2 during roundstart.
2015-08-25 03:27:54 +03:00
Zuhayr
bcca0d4aee Merge pull request #10842 from mwerezak/showers
Fixes cryogenic showers
2015-08-25 07:38:19 +09:30
HarpyEagle
e03585898d Cleans up flashlight fix
Moves icon state changes into update_icon(), less duplicated code. Also
makes glowing slime extracts less dumb.
2015-08-24 16:31:31 -04:00
Sligneris
d74b8f9dc3 IAA cartridge tweak
Adds Employment Records to IAA cartridges.
2015-08-24 21:43:39 +02:00
Mark9013100
f5f9a38ab4 Removes rev's autorecall 2015-08-24 13:20:06 -04:00
Kelenius
dd11a301e4 Merge branch 'dev' into ofMechfabAndPanic
Conflicts:
	code/game/mecha/mech_fabricator.dm
	maps/exodus-1.dmm
2015-08-24 18:16:36 +03:00
GinjaNinja32
da43277765 Merge pull request #10851 from PsiOmegaDelta/150824-CorrectCanUseTopicBaseCase
Corrects CanUseObjTopic base proc
2015-08-24 12:15:42 +01:00
PsiOmegaDelta
358e50d856 Corrects CanUseObjTopic base proc.
Now returns 1 instead of 0.
2015-08-24 12:16:18 +02:00
PsiOmegaDelta
3de6d1b19c Merge pull request #10381 from Zuhayr/hardsuitcontrol
Rig AI movement and module control buffs.
2015-08-24 12:04:31 +02:00
PsiOmegaDelta
9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm
2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/structures/girders.dm
	code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00