Commit Graph

164 Commits

Author SHA1 Message Date
Alberyk
ed6dbee896 Bay wizard port/rework (#1635)
Ports the newest bay wizard version, with some additions and changes.

General changes:
-ported the newest bay wizard
-wizards can select some school of magic, which also changes their spell selection as whole.
-added several new spells, like raise dead, contracts that bind the person with the wizard, and more.
-added wands, limited sources of certain types of effects/spell, also with their own bad effects for non wizards
-changed the wizard checks to a faction check instead of a mind check
-fixed wizards without certain slots due to race being fucked over due to it
-added new artifacts
-balanced some spells like the emp
-added a lot of new sounds to spell, mostly from tg
-remove horse mask from spell selection, also, you can melt the mask with acid now
-wizard's spell are now displayed at round end like traitors and what they did buy
-also fixes vaurca, and vox, antags spawning without a mask by default
2017-02-07 18:45:42 +02:00
LordFowl
e1fdba4528 Fixing Airlocks (#1546)
Fixes #1519
Fixes #1531
Fixes #1487
Fixes #1475

Adds a new airlock sprite for freezer-maint airlocks, and assorted periphery
2017-01-13 23:39:22 +02:00
NanakoAC
3d0044f174 Fixes #1514 (#1535) 2017-01-12 23:14:34 +02:00
NanakoAC
64df4907df Mousetrap, mouse and spawning fixes (#1497)
Adjusts mousetraps a bit. So they'll be triggered by all mobs instead of only humans, and trigger when walked on. Also nerfs the instastun that comes from stepping on them without shoes, because that's pretty broken against giant monsters like vaurca breeders. applies halloss instead based on mob size. Smaller things get hurt more.

Fixes #1445 
Fixes #1449 
Fixes #1450
2017-01-11 22:40:30 +02:00
LordFowl
bc8871ac2b Shells and Periphery (#1327)
Adds Shells. Adds tags. Adds IPC subspecies. Adds HK-47's. Does not add IPC construction.

Beyond the obvious review of shells, the exact stats of the IPC subspecies need review. They were largely an afterthought, and quickly overshadowed by the shell project.
2016-12-28 02:23:26 +02:00
skull132
9bca1343ae Merge: death and respawn (#1318)
Fixes #1314 .
Fixes a runtime error from setting time of deaths.
Fixes #1309 
Fixes #1312
2016-12-26 17:31:23 +02:00
LordFowl
93143a8e45 Vaurca Update Dec2016 (#1289)
Adds Vaurca subspecies and a whole slew of content related to them. Also, custom organs for them.
2016-12-25 01:11:09 +02:00
SoundScopes
97bb1e8e38 Travis: Indentation / list fixes (#1254)
Fixes the tools/indentation.awk script to not demand a comma at the end of perfectly valid comments.
Makes it report unnecessary commas in lists.
Readds it to the Travis build list.
2016-12-19 16:40:52 +02:00
skull132
a0aa10837e Reduce more compiles 2016-11-27 18:34:26 +02:00
Bedshaped
924507246d Clearing compiles (#22)
I gave IS_SYNTHETIC the same value as it has on our repo, hopefully that lazy fix is okay. I didn't want to search trhough where it's usually first assigned
2016-11-22 22:21:35 +02:00
NanakoAC
879f3faef8 Istype (#20)
Fixes a couple of is errors with missing functions.
Added isDrone as macro

restored the various is non macro functions. i don't know how or if they could be macro-ized
2016-11-22 20:25:28 +02:00
skull132
ee68f3c9d0 Final merge
Merge branch 'development-2' into development

# Conflicts:
#	baystation12.dme
#	code/_helpers/icons.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/computer3/laptop.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/floorlayer.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/objects/effects/decals/contraband.dm
#	code/game/objects/explosion.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/window.dm
#	code/modules/clothing/spacesuits/rig/rig.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/mob/freelook/update_triggers.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	nano/templates/sleeper.tmpl
2016-11-12 00:10:21 +02:00
NanakoAC
492d287667 Toolbox and Sprint Tweaks (#1098)
New feature! Toolboxes that are full of tools hit much harder, stun, and make a satisfying thunk. But they'll spill their contents everywhere, it's a one-shot thing

Fixes unathi being able to spam devour, and eat through faceplates

Slightly buffs IPC sprinting as requested by cake
2016-11-04 01:16:05 +02:00
skull132
e9b688e1f6 Merge branch 'development-2' into development
Christ on a stick. SO MANY ERRORS. REEE.

# Conflicts:
#	baystation12.dme
#	code/_helpers/lists.dm
#	code/_helpers/logging.dm
#	code/_helpers/text.dm
#	code/_onclick/click.dm
#	code/controllers/configuration.dm
#	code/controllers/master_controller.dm
#	code/datums/supplypacks.dm
#	code/game/antagonist/antagonist.dm
#	code/game/antagonist/antagonist_print.dm
#	code/game/antagonist/outsider/commando.dm
#	code/game/antagonist/outsider/ninja.dm
#	code/game/area/areas.dm
#	code/game/gamemodes/cult/cult_items.dm
#	code/game/gamemodes/game_mode.dm
#	code/game/jobs/access.dm
#	code/game/machinery/atmoalter/canister.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/mecha/mecha.dm
#	code/game/objects/effects/spiders.dm
#	code/game/objects/items.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/flash.dm
#	code/game/objects/items/devices/lightreplacer.dm
#	code/game/objects/items/devices/paicard.dm
#	code/game/objects/items/devices/scanners.dm
#	code/game/objects/items/devices/suit_cooling.dm
#	code/game/objects/items/devices/uplink.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/toys.dm
#	code/game/objects/items/weapons/cards_ids.dm
#	code/game/objects/items/weapons/handcuffs.dm
#	code/game/objects/items/weapons/manuals.dm
#	code/game/objects/items/weapons/material/kitchen.dm
#	code/game/objects/items/weapons/material/misc.dm
#	code/game/objects/items/weapons/material/swords.dm
#	code/game/objects/items/weapons/melee/energy.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/scrolls.dm
#	code/game/objects/items/weapons/storage/belt.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/tools.dm
#	code/game/objects/objs.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/janicart.dm
#	code/game/sound.dm
#	code/game/turfs/simulated.dm
#	code/game/verbs/ooc.dm
#	code/global.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/verbs/modifyvariables.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/head/hardhat.dm
#	code/modules/clothing/head/helmet.dm
#	code/modules/clothing/head/jobs.dm
#	code/modules/clothing/head/misc_special.dm
#	code/modules/clothing/shoes/jobs.dm
#	code/modules/clothing/spacesuits/alien.dm
#	code/modules/clothing/spacesuits/captain.dm
#	code/modules/clothing/spacesuits/miscellaneous.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces.dm
#	code/modules/clothing/spacesuits/rig/suits/alien.dm
#	code/modules/clothing/spacesuits/spacesuits.dm
#	code/modules/clothing/spacesuits/void/merc.dm
#	code/modules/clothing/spacesuits/void/void.dm
#	code/modules/clothing/suits/armor.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/clothing/suits/storage.dm
#	code/modules/clothing/suits/utility.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/clothing/under/jobs/security.dm
#	code/modules/economy/Events.dm
#	code/modules/economy/Events_Mundane.dm
#	code/modules/economy/economy_misc.dm
#	code/modules/events/blob.dm
#	code/modules/events/event.dm
#	code/modules/events/event_container.dm
#	code/modules/events/event_manager.dm
#	code/modules/events/money_lotto.dm
#	code/modules/events/prison_break.dm
#	code/modules/events/spacevine.dm
#	code/modules/hydroponics/trays/tray.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/emote.dm
#	code/modules/mob/holder.dm
#	code/modules/mob/language/station.dm
#	code/modules/mob/living/bot/cleanbot.dm
#	code/modules/mob/living/carbon/alien/diona/diona.dm
#	code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
#	code/modules/mob/living/carbon/give.dm
#	code/modules/mob/living/carbon/human/emote.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/outsider/vox.dm
#	code/modules/mob/living/carbon/human/species/station/golem.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/carbon/metroid/metroid.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defense.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/admin.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/drone/drone.dm
#	code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
#	code/modules/mob/living/silicon/robot/emote.dm
#	code/modules/mob/living/silicon/robot/robot_items.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	code/modules/mob/living/silicon/silicon.dm
#	code/modules/mob/living/simple_animal/bees.dm
#	code/modules/mob/living/simple_animal/friendly/cat.dm
#	code/modules/mob/living/simple_animal/friendly/corgi.dm
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	code/modules/mob/living/simple_animal/friendly/mouse.dm
#	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob.dm
#	code/modules/mob/mob_grab_specials.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_alien.dm
#	code/modules/organs/organ_external.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	code/modules/projectiles/ammunition/bullets.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/guns/energy/rifle.dm
#	code/modules/projectiles/guns/energy/special.dm
#	code/modules/projectiles/guns/projectile.dm
#	code/modules/projectiles/guns/projectile/automatic.dm
#	code/modules/projectiles/guns/projectile/pistol.dm
#	code/modules/projectiles/guns/projectile/revolver.dm
#	code/modules/projectiles/guns/projectile/shotgun.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/projectiles/projectile/special.dm
#	code/modules/reagents/reagent_containers.dm
#	code/modules/reagents/reagent_containers/food/drinks.dm
#	code/modules/research/designs.dm
#	code/modules/research/destructive_analyzer.dm
#	code/modules/research/rdconsole.dm
#	code/modules/spells/artifacts.dm
#	code/modules/spells/spellbook.dm
#	code/modules/tables/tables.dm
#	code/world.dm
#	config/example/config.txt
#	icons/mob/items_lefthand.dmi
#	icons/mob/items_righthand.dmi
#	icons/obj/lighting.dmi
2016-10-31 00:01:52 +02:00
NanakoAC
e9f8cdf6b1 Explosion Audio (#1057)
Adds directional audio for explosions and fixes a variety of sound issues with them.
Adds screenshaking for explosions
Tweaks volumes and adds missing sounds for several window/airlock interactions.

Also fixes some runtime errors here and there which were discovered during testing, mostly just adding safeties
2016-10-26 22:00:49 +03:00
skull132
87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development 2016-10-07 00:58:39 +03:00
NanakoAC
f1990fb747 Fixes #960 and some runtimes (#991)
Fixes synthetics speaking in a null language, by initialising their default language to basic. This should fix nymphs being unable to understand them.

Also fixes three runtime errors with finding types and devouring
2016-09-25 17:29:10 +03:00
NanakoAC
4c0ce0acc3 Fixes #970, fixes #953 (#978) 2016-09-21 07:04:23 +03:00
NanakoAC
e3a9bd28e7 Hotfixes for Diona (#969)
Fixes #967 
Fixes #959 
Fixes #957
2016-09-20 07:59:41 +03:00
NanakoAC
958d95af06 Nanako Dev Fixes 15SEP2016 (#926)
Fixes #894 
Fixes #896 
Fixes #920 
Fixes #892 
Fixes #922 
Fixes #919
2016-09-15 12:21:09 +03:00
NanakoAC
a5478a5360 Animal Tweaks: Second attempt (#849)
* Merge branch 'AnimalTweaks_Fix4' into AnimalTweaks_Fix5

# Conflicts:
#	code/modules/mob/living/living.dm

* REMOVED VENT THINGS FROM CHANGELOG

* switch statement for helper
2016-09-12 07:06:40 +01:00
NanakoAC
804851f6f6 Diona Overhaul - SEP2016 (#442) 2016-09-09 23:55:48 +03:00
SoundScopes
893398104f SoundScopes' bugfixes - 01SEP2016 (#848) 2016-09-01 20:45:18 +02:00
Bedshaped
7829408335 Adding species helpers (#770)
ishuman_species(jim) will return 1 if jim's a human and 0 if he's a filthy xeno

all are the form isTYPE_species()
2016-08-26 00:17:58 +02:00
NanakoAC
9d58b77e18 Fixes #721, fixes #710, fixes #706 (#731) 2016-08-12 23:00:27 +03:00
NanakoAC
d6803a26e3 Respawning Tweaks (#646)
changes:

rscadd: "Respawn timers are now tracked individually for playing as animals (mice), small synthetics (drones and pAIs) and crew (everything else). This means you can now play as a mouse or drone while waiting to respawn as a full crewmember.".
tweak: "You can now spawn as a drone immediately upon joining as an observer, without having to wait ten minutes. There is still a cooldown between respawning as a drone if you just died as one."
tweak: "Slightly improved the error messages if you try to respawn when you've not waited long enough."
In addition, unlisted changes:
The admin verb 'Allow player to respawn' now sets all three respawn timers
Respawn times are now centralised in setup #defines, for easier editing in future
Nonliving mobs will no longer attempt to ghost when deleted. A comment in mob.dm explains this change
2016-08-03 22:34:41 +03:00
NanakoAC
40b1cec944 PAI Candidacy Fix (#666)
Fixes #108 
Fixes #661 
Fixes #608
2016-08-03 22:33:44 +03:00
NanakoAC
c7a5186ef3 pAI and Held Mob Locations (#510)
Fixes #489
2016-07-12 15:11:35 +03:00
NanakoAC
92ba70df81 Alcohol Tweaks (#530)
- bugfix: "Fixed dizziness effects on alcohol, psilocybin, and cryptobiolin taking a long to start up and sometimes never starting for low doses"
  - tweak: "Sip size from alcohol bottles is now the same as for glasses, which is half what it was"
  - tweak: "Rebalanced all alcoholic drinks with more believable alcohol values, and adjusted alcohol metabolism. Generally drinks are stronger but metabolise more slowly, pace yourself!"
  - rscadd: "Different species now have varying susceptibility to alcohol. Tajarans get drunk slightly faster, skrell are twice as fast as humans, unathi can drink more, and vaurca get drunk very slowly, but alcohol poisons them"
  - bugfix: "Dousing people in alcohol and setting them on fire, now only works with spirits and liqeurs stronger than 40% ABV, and the heat of the resulting fire is based on the strength"
2016-07-12 14:53:15 +03:00
NanakoAC
4e61099040 Vomiting Overhaul (#365)
Centralises vomiting code to remove duplication and standardise effects.
Makes vomiting empty your stomach a bit (30u, the capacity of a drink
glass)
Adds Ipecac, an emetic to cause vomiting
2016-06-20 15:49:44 +03:00
NanakoAC
0f68f828ff Fixed sleepers and buckle duplication (#345)
* Fixed sleepers and buckle duplication

Fixed a bug where buckled people could be placed into multiple machines
simultaneously
Medical machines will now unbuckle a patient before accepting them.
Fixed dialysis beaker being ejected from sleeper beds
Dialysis beaker can now be checked and ejected while a sleeper is empty
2016-05-31 01:07:56 +03:00
skull132
fbd278babc Fixing Deadchat
+MODs and +ADMINs can now see dsay again, whenever, while other holders cannot.
2016-02-11 18:05:31 +02:00
skull132
fda5a7781f Remove R_MENTOR & R_HOST
Flags unnecessary, procs and functions concerning them removed.
2016-02-05 23:20:39 +02:00
PsiOmegaDelta
8a4250ddcd Can now connect cryo pods and computers with each other using the new multitool methodology.
Also cleans up Destroys().
2015-11-17 22:58:10 +01:00
PsiOmegaDelta
daa9b0e0bc When a diona splits, the main nymph inherits all known languages.
Fixes #11401.
2015-11-04 17:50:51 +01:00
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
2015-10-25 20:28:48 +01:00
PsiOmegaDelta
d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
Zuhayr
7d7f0da2ca Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable
Species tweaks
2015-09-21 19:08:53 +09:30
PsiOmegaDelta
d891fba1cc Mob size tweaks.
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
PsiOmegaDelta
d65ebf8b90 Meteor events are now direction biased.
When a meteor event triggers it now selects a main edge to arrive from, with a 20% probability to come from either neighboring edge. Will never arrive from the opposite edge.
The meteor event end time is now made more useful, and is based on a longest delay between meteor waves scenario.
The meteor event now supports multiple station Z-levels.
Removes the meteor sounds, as they can rarely be heard over the explosions anyway.
2015-09-18 21:45:15 +02:00
PsiOmegaDelta
7ce27f76fd Macro refactoring.
Turns several of the is* procs into istype defines.
2015-09-16 12:57:14 +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
Kelenius
388159c7f1 Makes beepsky less brutal
Fixes #10979
Fixes beepsky beating up handcuffed people
2015-09-08 11:36:55 +03:00
PsiOmegaDelta
c2e2252342 Synth access and icon update changes.
Refactors how synthetics set their modules. On login, if appearance selection was initiated but not finalized, the selection options popup again. Fixes a long-standing issue of borgs being able to look like the standard module by loging out.
Ensures the syndicate agent IDs and syndicate borgs will always have the same initial access permissions.
Removes now unnecessary syndicate snowflake code from NanoUI.
Synths now utilize actual ids.
2015-08-20 12:40:08 +02:00
PsiOmega
8138815dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-18 18:05:16 +02:00
Kelenius
afc5414ed9 Removes a few outdated mob mentions. Fixes a few things. Almost definitely fixes #7570. 2015-08-18 10:48:22 +03:00
PsiOmegaDelta
93e914f021 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/setup.dm
2015-07-30 10:49:37 +02:00
mwerezak
d203362d38 Fixes #10258
Turrets now aim at the chest/groin unless the target has a neck grab on someone, otherwise they aim elsewhere.
Projectiles are now able to miss targets that are lying or buckled, except when the target is at point blank range and is the original target for the projectile.
2015-07-28 20:17:32 -04:00
PsiOmega
34b0517578 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/admin/topic.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/nano/modules/atmos_control.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
2015-07-17 23:19:34 +02:00