Kelenius
baebd62c26
Fixes tank examine()
2015-09-15 10:14:07 +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
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
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
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
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
Datraen
05a29f8f3a
[BOTANY] Fixes plant storage nutrient check
...
Reported only high, low or none with previous system.
2015-09-06 16:42:58 -04:00
GinjaNinja32
5a335c9140
Improve formatting of admin announcements
2015-09-06 20:41:06 +01:00
PsiOmega
cc960624b9
Fixes mercenary mode not listing bought items.
...
The mercenary leader now spawns with the uplink, as is set as its owner.
2015-09-06 10:43:09 +02:00
Chinsky
d99c4ffaaa
Merge pull request #11021 from Zuhayr/antagsystem
...
Forgot a couple of tweaks.
2015-09-06 08:06:48 +03:00
Zuhayr
eacc1e7da7
Tweaks.
2015-09-06 11:19:54 +09:30
GinjaNinja32
3bb0e2503a
Merge pull request #11020 from Zuhayr/antagsystem
...
More antag fixes.
2015-09-06 02:47:12 +01:00
Zuhayr
111ff96312
Should fix antag candidate selection.
2015-09-06 10:59:59 +09:30
Zuhayr
efa995b372
Should fix antag scaling.
2015-09-06 10:53:32 +09:30
Samuel Novák
12a0bae5bd
Stop resting when pAI chassis collapses
2015-09-05 21:53:21 +02:00
GinjaNinja32
8685ff42a4
Merge pull request #11008 from Zuhayr/antaghud
...
Refactored the antagHUD to work better with the new antagonist system.
2015-09-05 17:01:57 +01:00
GinjaNinja32
0ae3b1dd0c
Merge pull request #11013 from PsiOmegaDelta/150905-ShieldCrush
...
Hull shields should no longer prevent the departure shuttle from leaving
2015-09-05 16:59:58 +01:00