Commit Graph

1058 Commits

Author SHA1 Message Date
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
Neerti 2daac2d647 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/4/2016_emp_tweaks
# Conflicts resolved:
#	code/modules/mob/living/carbon/human/human_defense.dm
2016-02-06 01:55:02 -05:00
Zuhayr 115eb19d33 Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate 2016-02-06 14:30:51 +10:30
Neerti 2b86af1350 EMP tweaks/fixes
For borgs, EMP no longer results in a stun.  Instead, they are confused, and their HUD becomes static-y for a moment.  Their module items are also forced back into the borg, effectively disarming them.
EMP now drains powercells from current charge instead of max_charge, so two blasts should not empty the cell, for borgs.
Fixed bug where EMP was being applied twice to human mobs, including FBPs, resulting in them literally dying in one hit.
Synthetic organs take much less damage from EMP.
Synthetic external organs also take less damage, but more than their organs.
Bonus: Runtime fix for spawning in as a borg.
2016-02-04 09:51:25 -05:00
EmperorJon 1e62406b6b Merge pull request #882 from Zuhayr/brainloss
Adds a coverage check to xenoflora splattering, adjusts brainloss across the board.
2016-02-02 01:07:12 +00:00
woodratt 2f3a2559b8 1.4.5- Fixes and Ecofriendly Lighting Tweaks
- More welding goggles added to engineering (2)
- Security checkpoint modified slightly.
- Tables added to chemistry to prevent dancing on dispensers.
- Universal recorder added to research outpost and art storage.
- Prescription glasses added to antag bases (merc, heist, wizard).
- Door buttons added to the captain's office.
- Changed the power draw of light fixtures from active_power_usage = ((light_range + light_power) * 10) to  active_power_usage = light_range * light_power. Which on average means that lights use a slightly more reasonable draw of power instead of a single bulb running about 330w.
2016-01-31 21:06:05 -08:00
Zuhayr 408cb5d8d8 Adds a coverage check to xenoflora splattering, adjusts brainloss across
the board.
2016-01-31 11:49:14 +10:30
Zuhayr 1c100bf457 Cleaning up post-merge. 2016-01-22 01:22:49 +10:30
Zuhayr e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr 7d1aa59de6 Fixes #715 2016-01-14 01:08:21 +10:30
PsiOmegaDelta 9b449cc183 Merge pull request #11963 from Baystation12/master
Dev-freeze
2016-01-11 08:28:56 +01:00
GinjaNinja32 12a38a3610 Fix #11955 2016-01-10 22:26:47 +00:00
GinjaNinja32 a00a6ae0e6 Fix #11955 2016-01-10 22:12:12 +00:00
PsiOmegaDelta da0a4c47cf Merge pull request #11756 from Baystation12/master
Dev-freeze
2015-12-26 11:58:42 +01:00
PsiOmegaDelta faec92b553 Can now join compatible cable coils of any type.
Partial backport of #11656. Fixes #10935.
2015-12-25 11:19:59 +01:00
Zuhayr 9df402b0de Fixes issues with burn repair surgery for robolimbs. 2015-12-25 08:50:58 +10:30
Zuhayr d71573e749 Further work on properly integrating, updating and fixing prosthetic options.
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
Hubblenaut 76577f2696 Fixes subcategories of cable coils not being mergeable 2015-12-10 16:28:44 +01:00
PsiOmegaDelta 443a376848 Ghosts can now view any object with a NanoUI interface.
However, ghosts can now also only view objects in range to ensure that the NanoUI window count is kept low.
Admins do not suffer this restriction and may also interact with these windows.
2015-12-07 02:35:33 -05:00
Neerti 2847d9a7ef Prepares for cherrypicking. 2015-12-07 02:35:20 -05:00
Neerti 4ecddd7e8b Adds attack_ghost() to base atmospherics object and APC to allow ghosts to see the nanoUI, and for admins to modify the objects from the interface. 2015-12-07 02:06:25 -05:00
PsiOmegaDelta 6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
Jon 85c704676f Updates all get_base_turf usages to get_base_turf_by_area.
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.
2015-12-05 04:24:17 +00:00
Zuhayr c2a4ee22cf Merge pull request #11316 from atlantiscze/apc-fix
Fixes #11149
2015-12-02 09:57:26 +10:30
Atlantis e33ae21f75 Adjusts APC emag behavior
- Mostly under-the-hood changes.
- Emagged APCs may now have their panel removed with screwdriver, so you can access wires
- Emagged APCs no longer rely on locked var, instead they check for emagged var as mwerezak suggested.
2015-11-30 23:19:04 +01:00
Neerti 4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta ae4d463fcb Map cleanup, tweaks and merge fixes. 2015-11-02 10:05:14 +01:00
PsiOmegaDelta 8b98b059a4 Merge pull request #11397 from Baystation12/dev-freeze
Dev freeze
2015-10-31 16:43:02 +01:00
PsiOmegaDelta 461023b5e7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-10-31 16:31:05 +01:00
Daranz 4b42f69247 Fix a problem with solar control computers not connecting to powernets on build 2015-10-28 13:35:24 -04:00
Atlantis cbcddcad53 Adjustment according to PsiOmegaDelta's suggestion 2015-10-16 14:44:01 +02:00
Atlantis c3e1611178 Fixes #11149
- Corrects APC behavior when hacked by malfunctioning AI.
- It should now be possible to hack the APC to unlock it even when it is hacked by the AI. Normal IDs still don't work on hacked APCs.
- A little side-fix, removal of malfunctioning AI's hack of an APC should now work correctly.
2015-10-16 14:38:20 +02:00
Neerti e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
2015-10-10 23:17:26 -04:00
Kelenius 83adba88d4 Updates blob
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
2015-10-05 18:10:16 +03:00
PsiOmegaDelta 9dd1a54191 Destroy tweaks.
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
PsiOmegaDelta 59f7b889d4 Constant fix. 2015-09-19 20:54:43 +02:00
PsiOmegaDelta fa6799ec3a APCs now produce a glow.
APCs now produce a glow, with similar range and strength as fire and air alarms.
2015-09-19 10:12:02 +02:00
PsiOmegaDelta f8a38ec7cf Improves powernet destruction.
While we currently do hard del datums this is a step towards a better world.
2015-09-16 08:00:22 +02:00
PsiOmegaDelta a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
PsiOmegaDelta f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
2015-09-11 08:38:28 +02:00
PsiOmegaDelta 2007004f3c Qdel cleanup.
Replaces a few instances of del() with qdel().
2015-09-09 12:20:33 +02:00
PsiOmega 3a2b1be8e1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-07 08:09:01 +02:00
PsiOmega 8dea4d40c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-07 08:01:15 +02:00
Zuhayr dd81250b1b Merge pull request #10784 from Kelenius/masterRuntimes
Fixes two runtimes
2015-09-07 14:01:24 +09:30
Zuhayr 0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
Neerti a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
2015-09-06 18:26:06 -04:00
Zuhayr 8c743329df Merge pull request #10955 from SkyMarshal/multi-z
Overhauls Multi-Z
2015-09-05 11:36:59 +09:30
Cael Aislinn 1de511b545 fixes emitter runtime by using new calling syntax
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-08-31 16:41:43 +10:00
SkyMarshal 772c320303 Multi-Z. 2015-08-30 14:15:20 -07:00