Commit Graph

20087 Commits

Author SHA1 Message Date
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
412380c3ab Merge pull request #11110 from GinjaNinja32/cleaning
fix #11061
2015-09-17 05:43:11 +03: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
GinjaNinja32
24ba93c3fa Merge pull request #11108 from FalseIncarnate/master
Invisible / Missing Growth State Fix
2015-09-16 09:48:32 +01:00
GinjaNinja32
6a61269edd Merge pull request #11106 from Kelenius/jetpackFixes
Fixes for jetpacks and gas tanks
2015-09-15 15:06:58 +01:00
GinjaNinja32
52b51a6be4 fix #11061 2015-09-15 13:24:11 +01:00
Kelenius
baebd62c26 Fixes tank examine() 2015-09-15 10:14:07 +03: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
Kelenius
3c4369823f Fixes for jetpacks
Jetpacks now GC; CO2 jetpacks no longer pointlessly create a datum that
is already created in the parent; CO2 jetpacks can be properly examined;
removes text() and adds spans and \the.
2015-09-14 16:35:52 +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
26d0a35699 Merge pull request #11085 from PsiOmegaDelta/150912-ForceMarch
Fixes #10988.
2015-09-12 23:29:03 -04:00
GinjaNinja32
5721e55f72 Merge pull request #11078 from PsiOmegaDelta/150912-StateYourLaws
Ensures the AI should always be able to state ion laws.
2015-09-13 02:23:27 +01:00
mwerezak
810ca147d0 Fixes #10710 2015-09-12 19:34:43 -04:00
PsiOmega
0c21ef741e Fixes #10988.
Lights now update when objects are moved into crates and lockers.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1926.
2015-09-12 20:43:24 +02:00
PsiOmega
81861f4dd6 Ensures the AI should always be able to state ion laws.
Switched the first character selection to a number to avoid collision with custom language keys on dev.
2015-09-12 15:02:42 +02: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
196c0db87f Merge branch 'master' into abandonedcrates 2015-09-11 00:56:33 -04: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
Vivalas
ae5810d6ed Fixes #10729 2015-09-10 13:50:24 -05:00
PsiOmegaDelta
9857961509 Merge branch 'master' into 150909-DelQdel 2015-09-10 07:05:09 +02:00
PsiOmegaDelta
8b36433c50 Merge branch 'master' into 150909-DelQdel 2015-09-10 06:48:05 +02: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
mwerezak
f69c723d40 Made flares a bit brighter 2015-09-09 20:42:40 -04:00
mwerezak
4c74b916ce Merge branch 'master' into do_mob-fix 2015-09-09 16:07:32 -04:00
mwerezak
124609ad71 Fixes various actions occuring instantly
Feeding food/drinks in particular.
2015-09-09 16:04:59 -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
PsiOmega
0e2f44e3ac Admin logs bought uplink items. 2015-09-07 20:02:43 +02:00
Zuhayr
412ee32d1c Stops autotraitor grabbing minds from the lobby for antag roles. 2015-09-07 17:01:34 +09:30
GinjaNinja32
4b73518d49 Merge pull request #11036 from PsiOmegaDelta/150907-AlwaysDoItYourself
Re-adds recharge station checks.
2015-09-07 07:19:50 +01:00
PsiOmega
8e9705b6c7 Re-adds recharge station checks.
Because no one who stuffs non-operational/dead borgs into recharge stations will bother to eject them.
2015-09-07 08:16:31 +02: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
88b95e1207 Fixes #7951 2015-09-07 14:40:23 +09:30
Zuhayr
43a349ee2a Fixes #11022 2015-09-07 14:25:45 +09:30