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
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
40ab99b354
Rubber bullets and beanbags now check melee armour instead of bullet armour
2015-10-08 16:36:51 -04: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
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
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
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
Chinsky
c3d6fd07fd
Merge pull request #11199 from mwerezak/paper-gender
...
Fixes #11196
2015-09-27 13:02:59 +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
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
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
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
Chinsky
7a2183e97e
Merge pull request #11107 from Kelenius/reishiJitter
...
Fixes #10925
2015-09-18 06:08:44 +03:00
PsiOmegaDelta
f65649c8ba
Fixes Pun-Pun (and other monkeys) pushing people around.
...
At some point a return had snuck in before the mob-push/swap flag settings. I blame a merge.
Relocated that code to handle_post_spawn() to hopefully ensure it'll always fire when appropriate.
2015-09-17 09:40:19 +02:00
Chinsky
5d1b1cd123
Merge pull request #11096 from PsiOmegaDelta/150913-SneakyMice
...
Prevents observer mice from spawning on the admin Z-level.
2015-09-17 05:42:15 +03:00
GinjaNinja32
73078a19ce
Merge pull request #11091 from mwerezak/lighting-fix
...
Fixes #10710
2015-09-16 14:59:39 +01:00
FalseIncarnate
4a9dc8dc8f
Invisible / Missing Growth State Fix
...
Fixes a number of plants seemingly randomly having invisible plant
growth states.
- This was caused by overly-rounded math resulting in attempts to call
growth states that do not exist.
2015-09-14 17:35:33 -04:00
mwerezak
db95743784
Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair
...
Converts some loc = to forceMove()
2015-09-14 12:11:09 -04:00
Kelenius
eef1013db2
Fixes #10925
...
Makes psilocybin less robust, also cuts down emote spam
2015-09-14 16:54:24 +03:00
PsiOmegaDelta
bb5680193f
Converts some loc = to forceMove()
...
Fixes #11102 .
2015-09-14 11:13:15 +02:00
Kelenius
9dd6f9762a
Resolves #11049
2015-09-14 12:05:28 +03:00
PsiOmegaDelta
b79f061877
Merge pull request #11103 from GinjaNinja32/pills
...
fix pill attack_log entry, switch to using key_name
2015-09-14 07:31:07 +02:00
GinjaNinja32
e29f5d108c
fix pill attack_log entry, switch to using key_name
2015-09-14 06:24:49 +01:00
PsiOmega
a938c7b648
Prevents observer mice from spawning on the admin Z-level.
2015-09-13 11:35:47 +02:00
mwerezak
810ca147d0
Fixes #10710
2015-09-12 19:34:43 -04:00
PsiOmega
8d57b2d0a0
Fixes observers being unable to see silicon antag status.
...
target_list contains mob/living mobs while the previous loop only looped over living/carbon/human.
To make things a bit of a headache hud_list is defined separately for living/carbon/human and living/silicon, instead of directly on /living.
It is certainly possible to define hud_list at mob/living instead but adding an extra loop for silicons is the method that is least likely to break things, thus the most appropriate for a master fix.
2015-09-12 14:39:10 +02:00
Chinsky
adf19d674b
Merge pull request #11055 from mwerezak/coffee-fix
...
Returns coffee jitteriness to an overdose effect
2015-09-11 22:49:35 +02:00
SomeoneElse
7e4191d212
[minor] Fix ATM transfer code, remove badly placed 'break'.
...
code/modules/economy/Accounts.dm:
remove break from charge_to_account()
2015-09-11 16:44:00 +06:00
mwerezak
e1e47ac189
Merge branch 'master' into coffee-fix
2015-09-11 00:54:47 -04:00
mwerezak
b9ee4ebc5e
Merge branch 'master' into abandonedcrates
2015-09-10 15:21:15 -04:00
mwerezak
67fd31bd3e
Abandoned crates now again use unique digits for their codes
2015-09-10 00:42:14 -04:00
mwerezak
19b195cd27
Revert "Reverts #10649 , fixes #10621 "
...
This reverts commit cb5df3963a
2015-09-09 21:12:24 -04:00
PsiOmegaDelta
2007004f3c
Qdel cleanup.
...
Replaces a few instances of del() with qdel().
2015-09-09 12:20:33 +02:00
mwerezak
cfa82e0c5e
Allows resisting while restrained, prevents stop-drop-and-roll while buckled.
2015-09-09 03:11:09 -04:00
mwerezak
5e478b58e8
Fixes #10746
...
Stumps can now be amputated, but not removed by taking damage.
2015-09-09 00:17:37 -04:00
PsiOmegaDelta
30069d1dce
Merge pull request #11044 from Kelenius/beepskyFixes
...
Makes beepsky less brutal
2015-09-08 10:41:30 +02:00
Kelenius
388159c7f1
Makes beepsky less brutal
...
Fixes #10979
Fixes beepsky beating up handcuffed people
2015-09-08 11:36:55 +03:00
Zuhayr
211e426009
Tweak.
2015-09-07 14:43:20 +09:30
Zuhayr
c2908bfc50
Fixes #10951
2015-09-07 14:43:12 +09:30
Zuhayr
dd81250b1b
Merge pull request #10784 from Kelenius/masterRuntimes
...
Fixes two runtimes
2015-09-07 14:01:24 +09:30
Chinsky
9533f2d154
Merge pull request #11026 from GinjaNinja32/announcement
...
Improve formatting of admin announcements
2015-09-07 01:02:36 +03:00
Chinsky
47f382b892
Merge pull request #11027 from Datraen/master
...
[BOTANY] Fixes plant nutrient storage unit check
2015-09-07 01:02:21 +03:00
GinjaNinja32