4748020ff2
Cleans up the Status panel.
2015-04-16 15:47:48 +02:00
d381eb6083
Drops the machinery part of the singularity.
2015-04-16 12:51:02 +02:00
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
20cfea7813
Merge pull request #8852 from PsiOmegaDelta/AutoGhost
...
Moving while dead now auto-ghosts you.
2015-04-15 19:59:38 +09:30
3f93454017
Merge pull request #8849 from PsiOmegaDelta/GhostPossess
...
Allow admins to drag-drop ghosts into mobs.
2015-04-15 12:46:56 +03:00
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
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
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
516b60962e
Merge remote-tracking branch 'upstream/dev' into CultPorting
2015-04-14 15:54:22 +02:00
32534346c7
Merge pull request #8773 from mwerezak/dislocation
...
Adds dislocating joints using a neck grab
2015-04-14 16:35:24 +03:00
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
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
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
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
f988545ed5
Merge pull request #8827 from comma/dev-freeze
...
Some fixes
2015-04-13 08:17:53 +02:00
d39cc9686d
Fixes #8687
2015-04-13 06:25:30 +03:00
b436925a33
Fixes #8735
2015-04-13 03:54:29 +03:00
2dea2424cb
Merge pull request #8811 from Zuhayr/dev
...
Adds construction drones.
2015-04-12 18:21:34 +03:00
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
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
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
1758f52123
Fixes errors in previous commit, makes some tweaks.
2015-04-12 13:09:03 +09:30
e833c14975
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-04-11 22:19:24 +09:30
f3be9b41f0
Ports /vg/'s Nas-Sie remake.
...
First phase: Port cultify procs.
2015-04-11 13:58:08 +02:00
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
7a40d193fe
Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen
...
Refactors NanoUI interaction (again)
2015-04-11 04:43:50 +03:00
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
690da7e42d
Merge pull request #8802 from PsiOmegaDelta/ISawTheRuntimes
...
Eye runtime fixes.
2015-04-11 02:05:51 +03:00
49d3f0fcf7
Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen
2015-04-10 15:49:36 +02:00
1ba8dcbca9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/vending.dm
2015-04-10 15:25:34 +02:00
d70ea77c2d
Moved stack into heist antag creation for pariah reinclusion.
2015-04-10 02:35:04 -07:00
baa2fe0dfa
Eye runtime fixes.
...
Ensures the spawn in ai/New() doesn't attempt to update eyeobj if the AI was deleted before the timer.
2015-04-10 11:29:50 +02:00
e4a0edb309
Readds CAN_JOIN to Vox for Ikky.
2015-04-10 02:28:38 -07:00
5fc3a2a511
Merge pull request #8792 from GinjaNinja32/runtime
...
Runtime fixes
2015-04-10 12:24:35 +03:00
e37c5c22d4
Refactors NanoUI interaction (again)
...
Takes NanoUI interaction code and splits it into more manageable modules.
The default handler that checks distances, camera coverage, etc., etc.
Admin NanoUI windows now only check for admin rights, ignoring sight, distance, and anything else.
ERT/mercenary appearance changer now remains open for as long as the mob remains on the admin Z-level.
PDAs and uplinks now require that you keep the item somewhere in your main inventory (or contents to be precise). Hands or ears are fine, inside bags are not.
Rig suits also check that they are in the operator's inventory or that the synthetic operator is somewhere within the suit's contents (recursively).
2015-04-10 11:19:38 +02:00
20d62c87ff
Borg module fixes
...
Fixes #8775
Fixes #8797
2015-04-10 09:50:47 +03:00
45947bb9f5
Addresses Zuh's issues so he'll stop wracking me.
2015-04-09 21:22:04 -04:00
990530d118
Ports /vg/'s spell system for the sake of cult porting.
...
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
2015-04-09 20:08:06 +02:00
b35fe67be8
Fixes robot Life() runtime
...
Fixes #8610
2015-04-09 16:08:33 +01:00
e6f83f8fa2
Merge pull request #8707 from PsiOmegaDelta/Garbage
...
Ports /vg/&/tg/'s garbage collector.
2015-04-09 08:50:12 +03:00
7b15bd59e5
Merge pull request #8768 from Yoshax/emergencymessage
...
Emergency message changes
2015-04-09 08:15:19 +03:00
6699cab7bf
Adds selectable default languages to all mobs which can speak
...
Set-Default-Language verb to set, Check-Default-Language verb to check
There are also links to set and reset in Check-Known-Languages
2015-04-08 15:18:59 +01:00
71a8ddf50e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/paperwork/paper.dm
code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
fe0185697e
Some dislocation fixes/adjustments.
2015-04-07 19:50:26 -07:00
cee229733e
Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev
2015-04-07 18:38:59 -07:00
d683bb07af
Allows dislocating joints using a neck grab + disarm
2015-04-07 15:46:42 -04:00
81bcad2b33
attackhand cleanup
2015-04-07 15:12:32 -04:00
175fdf57e6
Merge pull request #8703 from PsiOmegaDelta/Map
...
Area/Camera network refactor - Part 1
2015-04-07 21:41:06 +03:00
d78ae0d509
Merge branch 'aiemergencymessage' into emergencymessage
2015-04-06 20:19:27 +01:00
PsiOmega