06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
37f59551fc
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/PDA/PDA.dm
code/modules/reagents/reagent_containers/glass.dm
2015-06-16 10:30:50 +02:00
c96fee8942
Merge pull request #9819 from PsiOmegaDelta/150614-SpanMatch
...
Travis span matcher script
2015-06-16 03:40:10 +03:00
6373f3391f
Fixes #9219 .
...
Editing lists is now logged.
2015-06-15 18:29:07 +02:00
93c3d03801
Merge pull request #9817 from GinjaNinja32/records
...
'Fixes' NanoUI locking up on medical/security records
2015-06-15 15:30:08 +02:00
0423691ca2
Missed a span
2015-06-15 12:20:16 +01:00
4da75dba68
Fixes some more unbalanced HTML
2015-06-15 10:48:30 +01:00
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
3c525e907a
'Fixes' NanoUI locking up on medical/security records
2015-06-14 14:44:38 +01:00
9d90691605
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/gamemodes/wizard/spellbook.dm
2015-06-14 10:35:29 +02:00
8279cc48d8
mob/living/Life() now handles mutations and radiation.
2015-06-13 19:40:24 +02:00
8d0c7039df
Changes to dsay
...
- Adds dsay to list of +DEBUG verbs
- Changes dsay to use holder rank rather than trying to guess from rights
2015-06-13 16:46:03 +01:00
06f2009fbf
mob/living/Life() now handles environment.
2015-06-13 14:45:13 +02:00
2760836b15
mob/living/Life() now handles breathing.
2015-06-13 14:43:56 +02:00
ee88e7b8b4
Base Life-addition()
2015-06-13 13:36:08 +02:00
24cd59382c
Absolute Life paths.
...
Changes relative Life paths into absolute to make a potential refactoring easier to manage.
2015-06-13 11:41:37 +02:00
d989df7e8c
Adds the Jump-To-X verbs to the list of debug verbs.
2015-06-13 09:53:32 +02:00
c2f8e1242e
Expands admin jump permissions, cuts down on superfluous feedback.
2015-06-13 08:44:58 +02:00
572a480679
Merge pull request #9723 from atlantiscze/plant-fix
...
Fixes #9706
2015-06-13 01:38:47 +09:30
30909aaccd
Merge pull request #9793 from PsiOmegaDelta/150612-HiveTracking
...
Ghosts can now follow hivemind speech.
2015-06-13 01:07:49 +09:30
57f0a3535c
Observers can now only follow hivespeech as long as the speaker uses its real identity or antagHUD is enabled.
2015-06-12 17:19:29 +02:00
784f4d8705
Merge pull request #9792 from Techhead0/requestConsole
...
Request Console part two: NanoUI
2015-06-12 15:42:27 +02:00
8c7cbeb093
Ghosts can now follow hivemind speech.
...
Ghosts can now follow hivemind speech with the same targets as for normal speech (separate links for mob and eye if any, etc.).
2015-06-12 15:00:53 +02:00
b22afe6a59
Request Console NanoUI and fixes
...
Converts Request Console UI into NanoUI.
Fixes icon state not changing for normal priority messages.
Fixes consoles being partially operational while broken/unpowered.
Removes code for EXTREME priority messages.
2015-06-11 21:43:27 -04:00
5bd05df455
Fixes double request console messages for prison break event.
2015-06-11 19:38:57 -04:00
a0dcb04768
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/player_notes.dm
code/modules/admin/topic.dm
2015-06-11 12:06:40 +02:00
a2298df036
Merge pull request #9776 from Zuhayr/dev-freeze
...
Fixes
2015-06-10 21:40:20 -04:00
a57688c64f
Fixes tiny oversight in ghost trap datum. GG global vars.
2015-06-11 08:38:32 +09:30
2bd0d7a2f4
Automatic player note fixes.
...
Player notes should now properly include the relevant admin's ckey.
Automatically adds temporary and permanent bans to the player's notes.
2015-06-10 17:56:31 +02:00
f9134028b6
Fixes #9777
2015-06-10 23:14:34 +09:30
48b063a96e
Fixes #9620
2015-06-10 23:14:33 +09:30
cef958cac2
Fixes #9503
2015-06-10 23:14:33 +09:30
018c3fc2aa
Fixes #9517 and #9542
2015-06-10 23:14:33 +09:30
8a2c0226dc
Fixes #9597
2015-06-10 23:14:32 +09:30
4b04b867ac
Fxes #9625
2015-06-10 23:14:32 +09:30
347e6df2ac
Merge pull request #9704 from atlantiscze/clean-up-your-trash
...
[Done] Implements Destroy()'s on some things
2015-06-10 23:07:38 +09:30
b7c9969f87
Corrects mob reference.
2015-06-10 11:35:00 +02:00
7573ef961c
Merge remote-tracking branch 'upstream/dev' into 150609-TrackEye
2015-06-10 11:16:34 +02:00
75cffd60aa
Merge pull request #9780 from Baystation12/dev-freeze
...
Dev
2015-06-10 11:15:45 +02:00
b44da1ee42
Admin JMP now includes a link to EYE or BDY if any.
2015-06-10 11:08:31 +02:00
e7faa19ea3
Merge pull request #9779 from Baystation12/master
...
Dev-freeze.
2015-06-10 11:04:54 +02:00
449c8c8d8f
Refactors the ghost_follow_link proc to not use istype checks.
2015-06-10 10:08:17 +02:00
e669c1ab7c
Merge pull request #9687 from comma/dev
...
Fixes organs self-rejecting
2015-06-10 09:39:43 +02:00
1efd3f9394
Merge pull request #9775 from mwerezak/mrowl
...
Fixes tajaran name generation, tweaks
2015-06-10 07:59:10 +02:00
58d512d1e6
Fixes tajaran name generation, tweaks
2015-06-10 00:53:24 -04:00
6950790526
Merge pull request #9767 from PsiOmegaDelta/150609-IAmTooDumbForThisTruly
...
Fixes admin jumps.
2015-06-10 03:14:00 +01:00
581c9b1308
Fixes admin jumps.
...
Changes the checks and message target around, now targets usr instead of src.
2015-06-09 20:14:05 +02:00
6f70049a12
Expanded ghost following.
...
Ghosts can now follow the Eye of a speaking mob, if it has one, or the body of someone who has died.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1151 .
2015-06-09 16:36:43 +02:00
ebc58b08d9
Power monitor UI now attempts to get the turf of its host.
...
get_turf() gets upset when attempting to get the loc of the power monitor itself, now being a datum.
2015-06-09 16:24:47 +02:00
3591bd5599
Travis now builds using version 508.1287
...
throw is now a keyword. Updates usages where necessary to allow compilation.
2015-06-09 15:36:27 +02:00
PsiOmegaDelta