Zuhayr
100ffe4966
Merge pull request #8451 from comma/master
...
Fixes #8438
2015-03-13 17:19:36 +10:30
Chinsky
64a94a5043
Fixes #8438
...
Removed spawn based on suggestion, doesn't seem to cause that graphical glitch it was against.
2015-03-12 17:00:53 +03:00
PsiOmega
3af652fb77
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-12 10:30:16 +01:00
Mloc
d96e46bf10
fix sanitize_simple(), broken in #8008
...
fixes OOC newlines and IRC bot crashing.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-03-11 11:39:02 +00:00
Zuhayr
b5419a1673
Merge pull request #8443 from Baystation12/master
...
Master into dev-freeze.
2015-03-11 19:37:19 +10:30
Chinsky
69a080e2d6
Merge pull request #8421 from Neerti/3_9_2015-examine-text-med
...
Examine Tab Text: (Some) Medical Stuff
2015-03-11 07:28:54 +03:00
Zuhayr
a72b94e3f8
Merge pull request #8432 from PsiOmegaDelta/WanderingNano
...
Fixes #8264
2015-03-11 08:08:04 +10:30
PsiOmega
b00138aa42
Fixes #5787 .
...
The pull icon is now immediately displayed/hidden when one starts/stops pulling an objects.
Not stolen from https://github.com/tgstation/-tg-station/pull/8279 .
2015-03-10 18:01:27 +01:00
Neerti
e07f06d7f4
I shouldn't proofread when sleep deprived.
2015-03-10 10:55:14 -04:00
PsiOmega
373921fa44
Fixes #8264 .
...
updateUsrDialog() doesn't play well with nanoUI, forcing it to re-open and reposition on each cal.
2015-03-10 14:06:05 +01:00
PsiOmega
533ccef0ab
Robot code clean up and fixes.
...
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
PsiOmega
d3d9e0b2ed
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-10 12:48:27 +01:00
PsiOmegaDelta
ff11ae9d54
Merge pull request #8426 from mwerezak/misc
...
Penetrating bullets are now more likely to go through glass doors
2015-03-10 09:26:11 +01:00
Zuhayr
fce1168fd7
Merge pull request #8427 from PsiOmegaDelta/HydroRuntime
...
Fixes hydroponics update_icon() runtime.
2015-03-10 18:54:41 +10:30
Zuhayr
34c015cbbe
Merge pull request #8424 from mwerezak/exosuit
...
Allows removing exosuit pilots using maintenance protocols
2015-03-10 18:54:07 +10:30
PsiOmega
9fdd3ccbdf
Can now destroy/delete the suit cycler.
2015-03-10 09:08:52 +01:00
PsiOmega
a86c16b3e3
Fixes hydroponics update_icon() runtime.
...
Rounding could cause plant maturation to have a value of 0.
2015-03-10 08:16:20 +01:00
mwerezak
65a34943cd
Penetrating bullets are now more likely to go through glass doors
2015-03-10 03:00:24 -04:00
PsiOmega
85641b46e5
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-10 07:58:25 +01:00
mwerezak
3de6374b4a
Allows unconscious/dead exosuit pilots to be removed if maintenance protocols are enabled.
...
Enable maintenance protocols -> wrench -> crowbar -> multitool.
2015-03-10 02:47:54 -04:00
PsiOmegaDelta
56516d1ec5
Merge pull request #8419 from mwerezak/blazer
...
Adds custom item for Von2531
2015-03-10 07:11:18 +01:00
Chinsky
9c30024ca0
Merge pull request #8411 from volas/admin_stuff
...
Some admin stuff
2015-03-10 09:09:35 +03:00
Chinsky
dc4b02ceb2
Merge pull request #8399 from PsiOmegaDelta/CrySplosion
...
Fixes #8398 .
2015-03-10 09:08:58 +03:00
Neerti
be0971e690
Adds sabiram's help text to the game.
2015-03-09 23:19:15 -04:00
Zuhayr
277ceea894
Merge pull request #8405 from PsiOmegaDelta/StationAlertRuntime
...
Station Alert Runtime Fix
2015-03-10 09:30:57 +10:30
Zuhayr
fb56784fcb
Merge pull request #8408 from mwerezak/examine-fix
...
Examine fix
2015-03-10 09:30:51 +10:30
Zuhayr
00976aea43
Merge pull request #8417 from PsiOmegaDelta/SolidMatter
...
Attemps to fix #8390 + solid bonus
2015-03-10 09:29:04 +10:30
Zuhayr
fc985c2a27
Merge pull request #8416 from PsiOmegaDelta/Ninjas
...
Fixes ninja spawn logic.
2015-03-10 09:27:11 +10:30
mwerezak
1150902c9f
Adds custom item for Von2531
...
Blue blazer loadout item
2015-03-09 16:57:10 -04:00
Daniel García Baldomir
2fa6bb9ab2
Fixes mass driver not being registered on machines.
2015-03-09 21:54:38 +01:00
Chinsky
7a066b3c69
Merge pull request #8418 from mwerezak/supply-pack
...
More tweaks
2015-03-09 23:28:15 +03:00
PsiOmegaDelta
78d67a717a
Merge pull request #8384 from comma/spookycat
...
Gave Runtime spirit-sensing capabilities.
2015-03-09 21:17:23 +01:00
PsiOmegaDelta
d2ab1713ee
Merge pull request #8383 from comma/timetravel
...
Randomized roundstart hour
2015-03-09 21:17:11 +01:00
PsiOmegaDelta
668c4baee7
Merge pull request #8382 from comma/monkey_revenge
...
Allows you to scoop monkeys up
2015-03-09 21:17:03 +01:00
mwerezak
645910947b
Adds orderable flaregun crate
...
Mainly to make double-barrelled shotguns orderable.
2015-03-09 16:00:49 -04:00
volas
5fa66b2a8a
Changes to aooc
2015-03-09 22:59:52 +03:00
PsiOmega
baed39c263
Attempts to fix persistent station alarms. Makes wardrobes solid.
2015-03-09 20:55:05 +01:00
mwerezak
b9d2517d83
Tweaks random gun spawners and supply packs
...
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
2015-03-09 15:47:25 -04:00
mwerezak
91d7dd7049
Adjusts item_state placeholders
...
Tries to switch the current placeholders for something less awkward
looking. As well, the WT550 will no longer be mistaken for a pistol.
2015-03-09 15:39:24 -04:00
Chinsky
d433ccead2
Merge pull request #8412 from Neerti/3-9-2015_air_alarm_nano_shrink
...
Makes the width of the nanoUI for air alarms smaller.
2015-03-09 22:13:19 +03:00
Chinsky
ec9511c943
Merge pull request #8402 from PsiOmegaDelta/RemoteAir
...
Fixes various alarm issues.
2015-03-09 22:07:02 +03:00
PsiOmega
57c0591283
Fixes ninja spawn logic.
...
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
2015-03-09 19:22:07 +01:00
PsiOmegaDelta
b09606d85c
Merge pull request #8415 from mwerezak/runtimes
...
More runtime fixes
2015-03-09 17:51:59 +01:00
mwerezak
b60a045d70
Fixes door runtime, removes user = null hack
2015-03-09 12:43:10 -04:00
mwerezak
188c4491c7
Fixes xenoarch runtime
2015-03-09 12:20:08 -04:00
mwerezak
e840ba2d25
Fixes photocopier runtime
2015-03-09 12:12:31 -04:00
mwerezak
385ff4f2fa
Examine tab modularity
...
Also fixes antag info text sticking around if antag/observer status is lost
2015-03-09 12:09:18 -04:00
mwerezak
26cb0fe2c6
Fixes medical records laptop runtime
2015-03-09 12:04:04 -04:00
mwerezak
6bfa4ef3d5
Fixes AI freelook runtime
2015-03-09 11:59:02 -04:00
volas
e4e8ef3392
Merge remote-tracking branch 'upstream/dev' into admin_stuff
...
Conflicts:
code/modules/admin/admin_verbs.dm
2015-03-09 18:11:10 +03:00
