Zuhayr
608c766db2
Merge pull request #11279 from PsiOmegaDelta/151012-Ghostize
...
ghostize() now attempts to set the most relevant time of death.
2015-10-13 08:36:28 +10:30
HarpyEagle
241520f0bb
Cleans up autospawn, now uses existing code for selecting and choosing
...
candidates. Adds more debug messages, and removes unused code.
2015-10-12 13:03:50 -04:00
mwerezak
46f5bbc1d4
Merge pull request #11277 from Hubblenaut/stacks
...
Fixes stack creation logic and return value
2015-10-12 11:25:51 -04:00
Kelenius
741cb2d423
It was bork, I made it not bork
2015-10-12 13:57:47 +03:00
PsiOmegaDelta
7247906f41
ghostize() now attempts to set the most relevant time of death.
...
ghostize() now only uses the mob's time of death if the mob is actually dead, otherwise uses the current time. Fixes #11229 .
2015-10-12 12:55:34 +02:00
GinjaNinja32
de68e366f5
Merge pull request #11270 from Hubblenaut/master
...
Flavor Text Bugfix
2015-10-11 23:55:10 +01:00
Hubblenaut
1c8ec1a700
Fixes stack creation logic and return value
2015-10-11 22:02:05 +02:00
HarpyEagle
43d5f2e3bd
Ensures leftover candidates and pending antags are cleared after finalizing
2015-10-11 11:39:26 -04:00
PsiOmegaDelta
38c6ba3a07
Code relocation.
2015-10-11 17:31:21 +02:00
HarpyEagle
dec0629fae
Renames latespawn() to be less confusing
2015-10-11 11:26:24 -04:00
PsiOmegaDelta
070ca0adea
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/holodeck/HolodeckControl.dm
code/modules/mob/living/carbon/breathe.dm
code/modules/mob/living/carbon/human/life.dm
code/setup.dm
2015-10-11 17:17:41 +02:00
Chinsky
debe69aa80
Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer
...
Fixes #11263 .
2015-10-10 17:51:15 +03:00
Hubblenaut
d3572bf4cb
Fixes empty flavor text drawing two spaces
2015-10-10 15:55:25 +02:00
PsiOmegaDelta
fd3370c01f
Fixes #11263 .
...
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263 .
2015-10-10 10:11:48 +02:00
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
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
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
PsiOmegaDelta
f4be4c0ad9
Merge pull request #11238 from Baystation12/master
...
Dev-freeze
2015-10-04 17:31:44 +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
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
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
PsiOmega
145d8d91ef
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/_helpers/unsorted.dm
2015-09-26 08:43:06 +02: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
PsiOmegaDelta
de9e68cdcd
Merge pull request #11151 from Baystation12/master
...
Dev-freeze
2015-09-19 21:25:15 +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
PsiOmegaDelta
9946c837e4
Merge pull request #11134 from Baystation12/master
...
Dev-freeze
2015-09-18 08:50:11 +02: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
PsiOmega
5c1b8380a4
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/jetpack.dm
code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02: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