Hubblenaut
8528948bcd
Adds blinding/muzzling and changes trigger for jointbreaking
2015-04-19 20:17:28 +02:00
Hubblenaut
a40ef85a5f
Merge branch 'grab' into dev
...
Conflicts:
icons/mob/screen1.dmi
2015-04-19 16:00:28 +02:00
Chinsky
940b5c8c62
Merge pull request #8891 from volas/sanitize3
...
sanitize() 3
2015-04-19 14:59:36 +03:00
volas
7dedbc6d78
Alternative copytext, safe for html entities
2015-04-19 12:37:04 +03:00
Zuhayr
0b03a389df
Merge pull request #8910 from Baystation12/master
...
Master into dev
2015-04-19 17:26:04 +09:30
PsiOmega
27abc7404d
Gives AI a personal atmospherics control subsystem.
...
Includes further work on NanoUI interactions.
2015-04-19 00:24:19 +02:00
Zuhayr
05d05732f8
Merge pull request #8888 from PsiOmegaDelta/ThemLogs
...
Ports the changelog system used by /vg/, /tg/, and others.
2015-04-19 03:17:49 +09:30
Chinsky
511d3764e7
Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe
...
Makes objects without moues opacity not appear via alt-click.
2015-04-18 16:57:01 +03:00
Chinsky
fb34bd361b
Merge pull request #8860 from PsiOmegaDelta/SanityChecks
...
Ghost-possession sanity checks.
2015-04-18 16:56:36 +03:00
Chinsky
ead0ffdc29
Merge pull request #8853 from PsiOmegaDelta/ModuleStat
...
Adds Hardsuit Module tab.
2015-04-18 16:56:31 +03:00
Zuhayr
bc9d1ba38b
Merge pull request #8893 from Baystation12/dev-freeze
...
Dev freeze into dev
2015-04-18 21:50:40 +09:30
PsiOmega
3edfbf0040
Moves us to the changelog system used by /vg/, /tg/, and others.
...
Cleans up the HTLM folder, removing unused files.
Will also attempt include /tg/'s "You have unread changelog entries" notification on join.
2015-04-18 13:00:28 +02:00
PsiOmega
860fb4946f
Threating and actually using a signaler deadman switch now admin logged.
2015-04-18 12:18:14 +02:00
Jarcolr
c8256e70e1
Fixes #8810
...
This is targeting dev branch because latest commit on dev is from March 22 and the latest on master is from February 1.
2015-04-17 12:56:55 +03:00
PsiOmega
4748020ff2
Cleans up the Status panel.
2015-04-16 15:47:48 +02:00
PsiOmega
d381eb6083
Drops the machinery part of the singularity.
2015-04-16 12:51:02 +02:00
PsiOmega
08fa1193ce
Adds Hardsuit Module tab.
...
Allows one to (de)activate, engage, select and change module charges from the "Hardsuit Modules" tab panel.
Basic idea similar to spells.
2015-04-16 08:54:04 +02:00
PsiOmega
a6a9cb76e8
Ghost-possession sanity checks.
...
Adds sanity checks referred to in #8849 .
2015-04-15 16:10:36 +02:00
PsiOmega
2ddf8ecf28
Movement fixes.
...
Ensures observers use Process_Incorpmove() despite being dead, while disallowing the once living from doing the same.
Ensures incorporeal creatures denied moving unto holy ground don't keep calling more movement code.
2015-04-15 14:21:58 +02:00
Zuhayr
20cfea7813
Merge pull request #8852 from PsiOmegaDelta/AutoGhost
...
Moving while dead now auto-ghosts you.
2015-04-15 19:59:38 +09:30
Chinsky
3f93454017
Merge pull request #8849 from PsiOmegaDelta/GhostPossess
...
Allow admins to drag-drop ghosts into mobs.
2015-04-15 12:46:56 +03:00
PsiOmega
d8f1045e53
Moving while dead now auto-ghosts you.
...
Also removes now redundant incorporeal_move check that's made further up the proc.
2015-04-15 09:19:19 +02:00
PsiOmega
0d0786dfa1
Allows dead humans to speak, even if muzzled.
...
Prevents a fate most cruel, at least when the ghost is still possessing its dead body.
2015-04-15 09:06:04 +02:00
Zuhayr
1aee7282ff
Quickfix for pariahs breaking cuffs.
2015-04-15 16:30:13 +09:30
PsiOmega
f9b3547e8d
Allow admins to drag-drop ghosts into mobs.
...
This functions the same way as editing the ckey in vv.
Has the same permission check as assume-direct-control.
It requires the admin also be a ghost to avoid conflicts with other drag drop code.
2015-04-15 08:49:00 +02:00
PsiOmega
1bd4f21c58
Makes objects without moues opacity not appear via alt-click.
...
Prevents clicking objects you should not be able to click.
2015-04-15 08:31:40 +02:00
PsiOmega
516b60962e
Merge remote-tracking branch 'upstream/dev' into CultPorting
2015-04-14 15:54:22 +02:00
Chinsky
32534346c7
Merge pull request #8773 from mwerezak/dislocation
...
Adds dislocating joints using a neck grab
2015-04-14 16:35:24 +03:00
PsiOmega
0466a1f47a
Camera network refactor - Part 3
...
Swept through every single Z-level, re-named/networked every single camera.
Fixes the AI Jump-To-Network verb not properly updating the network (used by the Show-Camera-List verb).
Also removes redundant Cancel option in the Show-Camera-List.
2015-04-14 11:41:01 +02:00
mwerezak
d6498cd45f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation
...
Conflicts:
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/human_organs.dm
2015-04-13 17:12:02 -04:00
mwerezak
da5518f8b2
Updates various dependencies on organ brokenness to use the is_broken() proc. Updates external organ brokenness to ensure broken description is set.
2015-04-13 16:38:33 -04:00
GinjaNinja32
d4eb42b38b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/projectiles/targeting.dm
2015-04-13 12:49:07 +01:00
PsiOmegaDelta
f988545ed5
Merge pull request #8827 from comma/dev-freeze
...
Some fixes
2015-04-13 08:17:53 +02:00
Chinsky
d39cc9686d
Fixes #8687
2015-04-13 06:25:30 +03:00
Chinsky
b436925a33
Fixes #8735
2015-04-13 03:54:29 +03:00
Chinsky
2dea2424cb
Merge pull request #8811 from Zuhayr/dev
...
Adds construction drones.
2015-04-12 18:21:34 +03:00
PsiOmega
1511e2b3f4
Ports /vg/'s Nas-Sie remake.
...
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
2015-04-12 16:19:16 +02:00
PsiOmega
6458d91d83
Fixes AIs inside inteliCards being unable to interact with the world around it.
...
Apparently being inside an object affects view() in unexpected ways.
2015-04-12 14:04:00 +02:00
Zuhayr
0223223c77
Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff
...
Revenge of the Research Module (and other stuff from that PR)
2015-04-12 13:16:45 +09:30
Zuhayr
1758f52123
Fixes errors in previous commit, makes some tweaks.
2015-04-12 13:09:03 +09:30
Zuhayr
e833c14975
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-04-11 22:19:24 +09:30
PsiOmega
f3be9b41f0
Ports /vg/'s Nas-Sie remake.
...
First phase: Port cultify procs.
2015-04-11 13:58:08 +02:00
Zuhayr
a029f88cfc
Added construction drone variant, updated the construction area map slightly.
2015-04-11 19:20:13 +09:30
=
78987a436a
Merge resolution.
2015-04-11 13:23:17 +09:30
Chinsky
7a40d193fe
Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen
...
Refactors NanoUI interaction (again)
2015-04-11 04:43:50 +03:00
Chinsky
be3f372680
Merge pull request #8788 from PsiOmegaDelta/PortedSpells
...
Ports /vg/'s spell system for use by the cult port.
2015-04-11 02:05:58 +03:00
Chinsky
690da7e42d
Merge pull request #8802 from PsiOmegaDelta/ISawTheRuntimes
...
Eye runtime fixes.
2015-04-11 02:05:51 +03:00
PsiOmega
49d3f0fcf7
Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen
2015-04-10 15:49:36 +02:00
PsiOmega
1ba8dcbca9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/vending.dm
2015-04-10 15:25:34 +02:00
Zuhayr
d70ea77c2d
Moved stack into heist antag creation for pariah reinclusion.
2015-04-10 02:35:04 -07:00
