Commit Graph

283 Commits

Author SHA1 Message Date
Yoshax d4e8589d8f Ports Mloc's HUD fixes from Bay and further fixes ours because of code differences 2016-07-11 16:35:21 +01:00
Mechoid 7bcd041e09 Fixes overlay issue with ghosts when choosing sprites, and adds more sprites to choose from from popular demand. 2016-05-31 14:30:17 -07:00
Yoshax 77ee2215e7 Removes unused and unnecessary spam prevention 2016-05-26 04:24:18 +01:00
EmperorJon 23e9145223 Merge pull request #1497 from Mechoid/Cult_Ghost
Manifest Ghost Additions
2016-05-01 16:35:31 +01:00
Mechoid 7ddcb4c8fb Adds 2 verbs to ghosts.
-Choose Sprite: Ability to pick a sprite from a list, found in icons/mob/ghost.dmi
 -When manifested: Spectral Whisper: The ghost whispers into the mind of a target in sight-range. Works through walls.

When a ghost is made visible by adminnery or cult, their emotes become visible to anyone who has sight of them. If they become invisible somehow (By toggling or adminnery) they will return to using normal ghost emotes in deadchat.
2016-04-26 17:03:39 -07:00
Hubblenaut c61053d432 Morgue Trays interface with occupant minds 2016-04-25 20:10:43 +02:00
Kelenius acc78a8000 Changes types of ghosts and eyes
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Zuhayr 7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr 98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
PsiOmegaDelta 2968952913 Merge pull request #11438 from Baystation12/master
Dev-freeze
2015-11-10 10:34:40 +01:00
Neerti 4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
PsiOmegaDelta 5c587e69b6 Exploit fix.
Players can no longer immediately respawn as mice by ghosting.
2015-11-07 17:12:50 +01:00
PsiOmegaDelta 3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
PsiOmegaDelta 3fd172ee63 Merge pull request #11294 from Baystation12/master
Dev-freeze
2015-10-14 08:40:03 +02:00
PsiOmegaDelta 7247906f41 ghostize() now attempts to set the most relevant time of death.
ghostize() now only uses the mob's time of death if the mob is actually dead, otherwise uses the current time. Fixes #11229.
2015-10-12 12:55:34 +02:00
PsiOmegaDelta 55c9f7533b Alien eggs now include follow and spawn links. The alien larvae plant seed check now uses the specific type instead of a name. 2015-10-07 08:56:13 +02:00
PsiOmega 63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
HarpyEagle 380b89fcc0 Fixes #11130, renames aghosted var
because it is no longer used solely for aghosting.
2015-09-26 20:48:13 -05:00
PsiOmegaDelta 232dd5bfb1 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-09-18 08:51:10 +02:00
PsiOmegaDelta 9946c837e4 Merge pull request #11134 from Baystation12/master
Dev-freeze
2015-09-18 08:50:11 +02:00
PsiOmega a938c7b648 Prevents observer mice from spawning on the admin Z-level. 2015-09-13 11:35:47 +02:00
PsiOmega 0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
2015-09-13 10:52:01 +02:00
PsiOmega 830d2feb0d Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
2015-09-13 10:44:06 +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
Zuhayr fca95039bf Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
Zuhayr 9d5f14298d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/gamemodes/traitor/traitor.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-09-07 11:03:41 +09:30
Zuhayr 90c9d31782 Refactored the antagHUD to work better with the new antagonist system. 2015-09-05 18:51:17 +09:30
PsiOmega 93a8a3a13f Observers can now view radio settings, admins can alter them. 2015-09-04 10:07:41 +02:00
PsiOmega 579c5be239 Makes observers use forceMove.
This ensures things like OnEnter/Exit, light updates properly for all occasions when a ghost moves, not only for manual movement.
2015-08-23 17:45:46 +02:00
PsiOmegaDelta 120ce3f20c Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums
Conflicts:
	code/modules/admin/topic.dm
2015-08-20 14:16:35 +02:00
PsiOmegaDelta 74b8f6c3be Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-08-17 09:44:21 +02:00
PsiOmegaDelta 55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/setup.dm
2015-08-17 09:37:49 +02:00
PsiOmega 1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02:00
PsiOmega c81ad0964e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-08-15 11:06:03 +02:00
PsiOmega 3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
mwerezak cd153ad975 Aghosted mobs no longer act as SSD
Removed player_logged var since it didn't serve it's intended purpose and replaced with aghosted var. Changed SSD checks to only look at client since regardless of what key gets set to I think we probably don't want players being told a mob is SSD if there is some client controlling it.
2015-08-14 22:41:51 -04:00
GinjaNinja32 f52d48c91f Merge remote-tracking branch 'upstream/dev' into follow
Conflicts:
	.travis.yml
2015-08-13 05:54:30 +01:00
PsiOmega ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
PsiOmegaDelta 48d5e73729 Fixes an observer runtime. 2015-08-12 09:10:16 +02:00
GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
SomeoneElse 8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta 7e6cb6f38c Compilation/definition fixes. 2015-07-31 10:05:42 +02:00
PsiOmegaDelta 93e914f021 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/setup.dm
2015-07-30 10:49:37 +02:00
PsiOmegaDelta b6bd51828a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/admin/admin_verbs.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/syringes.dm
2015-07-30 10:38:44 +02:00
GinjaNinja32 74f04671f8 His book? Her book. 2015-07-28 13:37:15 +01:00
PsiOmegaDelta 5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
2015-07-27 10:20:20 +02:00
GinjaNinja32 7eb1e547a3 Better follow code 2015-07-26 10:45:45 +01:00
Mloc 65ac3d97d0 Revert "get rid of mob.see_in_dark and species.darksight"
This reverts commit 278a4c38ec.
2015-07-22 15:14:40 +01:00