GinjaNinja32
d5928d9927
Merge pull request #11260 from mwerezak/ttv
...
Fixes TTV Yield
2015-10-10 09:05:00 +01:00
HarpyEagle
fa86509daf
Readds organ damage from failing to mend ribs
2015-10-09 18:57:17 -04:00
HarpyEagle
5684befee2
Fixes #11262
2015-10-09 18:57:17 -04:00
Hubblenaut
80cc83dbf8
Fixes backup power test light
2015-10-09 17:44:30 +02:00
HarpyEagle
6c3bbb9ee8
Updates changelog, fixes comment
2015-10-09 11:39:22 -04:00
HarpyEagle
63838b01d4
Updates preset TTV bombs, adds debug verb
2015-10-09 11:18:12 -04:00
PsiOmegaDelta
e237e33030
Merge pull request #11259 from mwerezak/rubber-bullets
...
Rubber bullets and beanbags now check melee armour instead of bullet armour
2015-10-09 12:42:44 +02:00
HarpyEagle
1cf6ace74e
Fixes #11071 , #10936
...
Adjusts fire_fuel_energy_release to compensate for fixed fire heat release.
Adjusts liquid fire burn parameters so that liquid fuel fire heat release and
burn duration is unaffected.
2015-10-09 01:19:15 -04:00
HarpyEagle
9639d608a6
Fixes calculate_firelevel() not counting oxidizer
...
Fixes calculate_firelevel() not counting oxidizer when determining the ratio
of reactants to other gases. As well firelevel calculation is now done
separately for burning gas and burning liquid.
Adjusted FIRE_LIQUID_BURNRATE_MULT so that liquid burn rate is unaffected by
this fix, which will result in generally higher firelevels and thus faster
burn rates.
2015-10-08 23:40:08 -04:00
HarpyEagle
fa661f998f
TTV Refactor
...
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.
2015-10-08 23:26:05 -04:00
HarpyEagle
40ab99b354
Rubber bullets and beanbags now check melee armour instead of bullet armour
2015-10-08 16:36:51 -04:00
PsiOmegaDelta
bd7c475fcc
Stack material use now depends on charge costs.
...
This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943 .
2015-10-08 20:29:39 +02:00
PsiOmegaDelta
c5d8fbfd57
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/modules/mob/living/living_defense.dm
2015-10-07 08:07:23 +02:00
Chinsky
f47a58e23e
Merge pull request #11244 from Kelenius/hackMe
...
Basic encryption hack popup only shows suitable APCs
2015-10-06 20:29:51 +03:00
Chinsky
8107786cbd
Merge pull request #11245 from PsiOmegaDelta/151005-RobustRoboticsSpeech
...
Makes silicon language handling more robust.
2015-10-06 19:32:54 +03:00
Chinsky
c7070dd7f7
Merge pull request #11251 from PsiOmegaDelta/151006-JobReport
...
Antagonist summary printout now prefers assignment over special role.
2015-10-06 19:26:42 +03:00
PsiOmegaDelta
ec097d928a
Antagonist summary printout now prefers assignment over special role.
...
As antags are listed under relevant headings, i.e. "The traitors were", this seems more reasonable. Fixes #10817 .
2015-10-06 09:19:40 +02:00
HarpyEagle
74950268d7
Fixes fire_stacks update logic
2015-10-05 19:24:33 -04:00
PsiOmegaDelta
bbcadcc080
Makes silicon language handling more robust.
...
Also fixes an issue with lists being targets for qdel(). Fixes #11221 .
2015-10-05 11:21:09 +02:00
Kelenius
f3effa8df7
Basic encryption hack popup only shows suitable APCs
2015-10-05 11:40:19 +03:00
PsiOmegaDelta
91faf8555f
Antag placement now favors mobless turfs.
...
If one such turf is available, otherwise picks a random populated turf. Fixes #11237 .
2015-10-05 10:13:05 +02:00
PsiOmegaDelta
f4be4c0ad9
Merge pull request #11238 from Baystation12/master
...
Dev-freeze
2015-10-04 17:31:44 +02:00
GinjaNinja32
5ef5f40cbe
add 'info' topic command to get information on a character
2015-10-02 12:45:19 +01:00
mwerezak
4dc7ff8e9c
Merge pull request #11223 from GinjaNinja32/11222
...
fix #11222
2015-09-30 13:43:47 -04:00
GinjaNinja32
11141462a0
fix #11222
...
also fixes the name and adds feedback to adding items
2015-09-30 00:00:36 +01:00
PsiOmegaDelta
86223d65bf
TODO done.
2015-09-29 11:28:31 +02:00
PsiOmegaDelta
597631687b
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-29 11:26:42 +02:00
PsiOmegaDelta
d77bcd7937
The silicon law manager now only requires the host to be conscious.
...
This should mean that the law manager is available even for carded AIs, even with the wireless interface disabled. Fixes #11139 .
2015-09-28 21:23:10 +02:00
PsiOmega
807e7bf954
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
Chinsky
c3d6fd07fd
Merge pull request #11199 from mwerezak/paper-gender
...
Fixes #11196
2015-09-27 13:02:59 +03:00
Chinsky
7ad55e0197
Merge pull request #11200 from mwerezak/sojourner
...
Fixes #11130
2015-09-27 13:02:50 +03:00
HarpyEagle
380b89fcc0
Fixes #11130 , renames aghosted var
...
because it is no longer used solely for aghosting.
2015-09-26 20:48:13 -05:00
HarpyEagle
592c824837
Changes paper and paper bundle gender, plus rename
2015-09-26 20:27:57 -05:00
Hubblenaut
f0481b551e
Fixes grab-buckling overwriting pixelshift
2015-09-26 14:11:01 +02:00
PsiOmega
145d8d91ef
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/_helpers/unsorted.dm
2015-09-26 08:43:06 +02:00
GinjaNinja32
c987fedc24
Merge pull request #11180 from BlueNexus/patch-1
...
Gave Asset Protection their proper rig
2015-09-25 14:09:28 +01:00
Chinsky
0ce1495a12
Merge pull request #11178 from GinjaNinja32/lawzero
...
fix traitor AIs not getting a law zero
2015-09-25 11:46:40 +03:00
PsiOmegaDelta
509486dbd9
Merge pull request #11181 from GinjaNinja32/crash_with
...
Add proc/crash_with, fix two incorrect qdel calls
2015-09-25 06:31:38 +02:00
PsiOmegaDelta
61a4d3b7af
Merge pull request #11185 from Baystation12/master
...
Dev-freeze
2015-09-24 08:17:45 +02:00
BlueNexus
76f06e6e9b
Gave Asset Protection their proper rig
...
Fairly self explanatory.
2015-09-23 13:29:54 +01:00
GinjaNinja32
8ed4faf7b2
Add proc/crash_with, fix two incorrect qdel calls
2015-09-23 13:29:54 +01:00
GinjaNinja32
9be47c6374
Permabans do not expire, and we don't need to show expired when it's been manually lifted
2015-09-23 13:03:11 +01:00
GinjaNinja32
c707519d1f
Add specific color for expired bans in ban panel, fix some formatting and a runtime
2015-09-23 12:58:39 +01:00
GinjaNinja32
280c932add
fix traitor AIs not getting a law zero
2015-09-23 12:26:53 +01:00
PsiOmega
5b4c7340e4
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-21 17:26:19 +02:00
Daranz
ebaa452c4c
Fix spelling: 'its' in place of 'it's'
2015-09-21 15:37:22 +02:00
PsiOmegaDelta
de9e68cdcd
Merge pull request #11151 from Baystation12/master
...
Dev-freeze
2015-09-19 21:25:15 +02:00
Hubblenaut
4eef7ab65d
Fixes beds occasionally buckling in odd directions
2015-09-19 15:27:24 +02:00
PsiOmegaDelta
2d01a06f00
Corrects world-edge math.
...
Meteors coming from the east would immediately be transfered to another Z-level and deleted, due to being considered outside the Z-level transition border.
2015-09-18 15:23:18 +02:00
GinjaNinja32
780db3314d
Merge pull request #11128 from PsiOmegaDelta/150917-BumpyRide
...
Fixes Pun-Pun (and other small mobs) pushing people around.
2015-09-18 08:20:35 +01:00
