Alberyk
871b2dc302
Unathi alt language and more fixes ( #1299 )
...
-added an alt unathi language, at jackboot's request
-added an automatic shotgun weapon
-fixed rifles having the wrong delay when not wielded
-fixed non-lore friendly ipc limbs
-fixed #1292
-fix syndicate borgs not having the right assigned mind
2016-12-25 20:51:15 +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
Alberyk
89ae849adc
Bay merge fixes ( #1225 )
...
What is being fixed:
-messed up sec armor
-skeleton, vox and resomi being player species
-abhumans also had restrictions added until whatever should be done with them was decided or something
-fixing dionae language name
-fixing bluespace suicide and some additions/changes
-fixing random vaurca name gen thing
-fixing missing ipc chest and groin sprites
-added missing resomi hair and some new dank vox hair styles
2016-12-18 10:52:16 +02:00
skull132
9b094ad0eb
Merge branch 'upstream/development' into development
...
# Conflicts:
# code/_helpers/time.dm
# code/game/objects/items/devices/floor_painter.dm
# code/game/objects/items/stacks/medical.dm
# code/global.dm
# code/modules/cargo/randomstock.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_movement.dm
# code/modules/paperwork/faxmachine.dm
2016-12-18 01:06:45 +02:00
Alberyk
38a0033b2e
Fixing compile errors ( #8 )
...
* Fixing more errors
* Update baystation12.int
2016-11-12 12:47:43 +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
skull132
cd26e68d8a
Revert Limb Transform ( #1136 )
...
Because we actually want to keep it. Even if BYOND is silly with its AA application.
2016-11-08 00:18:42 +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
LordFowl
1062b03eee
Runtime v. Mouse + Head-spears ( #1083 )
...
Fixes runtimes in mousegun and beegun, fixes head-spear issues.
2016-10-29 21:30:31 +03:00
skull132
87e041aa75
Merge remote-tracking branch 'bay12-upstream/master' into development
2016-10-07 00:58:39 +03:00
NanakoAC
30dde5cff3
Diona Light Fixes ( #1018 )
...
Fixes #1018
Fixes diona not recieving any light in space - initialises light amount to the max light value, so that is used in tiles where there is no lighting overlay. ie, space
Fixes dionastats organ references not updating when organs are lost or regrown
Fixes some spamming from lightmessages when a diona recovers after almost dying in the dark.
Adds a new light sensing message to the check light verb, if the response node is damaged or missing
2016-09-29 00:35:34 +03:00
skull132
8ebb69fcab
Runtime in mob life if they have no mind ( #971 )
...
It was built on the assumption that they all have a mind. Which not everyone does.
2016-09-20 08:37:09 +03:00
NanakoAC
804851f6f6
Diona Overhaul - SEP2016 ( #442 )
2016-09-09 23:55:48 +03:00
Alberyk
c9f53b0923
New wishgranter and skeletons ( #638 )
...
Adding a reworked wish granter, the old ones still exists, and skeletons as a special species (with plans for the future).
2016-08-02 21:45:57 +03:00
NanakoAC
b7291faccd
Voidsuit Naming Fix ( #580 )
...
Fixed many little instances where voidsuits were wrongly referred to as hardsuits
2016-07-24 23:50:36 +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
skull132
443a49a49b
Merge branch 'master' into development
2016-07-10 14:25:54 -04:00
LordFowl
a6c1085e37
Fowl's Bugfixes 1 ( #521 )
2016-07-10 01:13:29 +03:00
LordFowl
fbaeb13039
Vaurca Patch 3.00; Fixes #496 ( #493 )
...
Vaurca filtration bit organ added. When destroyed or removed, oxygen becomes poisonous to the Vaurca.
Vaurca lungs have been made organic.
Vaurca take 3x toxin damage, as a result of their rather alien biology.
Vaurca lose additional blood when an opportunity to lose blood presents itself, due to their open-circulatory system.
Vaurca organs are no longer all robotic, except for the neural socket and filtration bit.
Vaurca organ surgery is now possible.
2016-07-10 01:09:56 +03:00
skull132
bdb040bf9f
Hotfix - Vaurca Language Removal ( #447 )
...
You used datums instead of text.
2016-06-24 17:09:13 +03:00
LordFowl
56e288e910
Vaurca Content 2 ( #426 )
...
Vaurca hivemind language added.
Vaurca appropriate name generator added.
Tied Vaurca language to their neural socket organ.
Added a method for non-Vaurca to intercept the Vaurca hivenet so long as they construct the correct item.
Sprites for Vaurca organs.
Neutered all Vaurca.
Cutting open a Vaurca for surgery now requires heavier equipment.
Injecting a Vaurca with a syringe now will take time.
Adds various Vaurca cosmetic items available via loadout.
Adds a few new burst-fire weapons exploiting the burstfire fix - obtainable via research or adminbus.
Ports the ability to stick heads on spears from Paradise-code.
Added an error message when trying to bite someone before the cooldown expires.
Removed spoken Vaurca language.
Heavily nerfed K'ois' properties.
Halved the nutrition value of nutriment, returning it to old-code state.
Nerfed the damage dealt by bite, while reducing the cooldown.
Fixed burstfire weapons spamming attack messages when fired, allowing for more automatic weapons.
Fixed Vaurca player ability to select coloured eyes.
2016-06-24 14:55:44 +03:00
NanakoAC
6d0f8388a7
Medical HUD useability improvements ( #413 )
...
- bugfix: "Medical huds will now properly update as wounds heal
passively, or when bandaged"
- rscadd: "Added a new Medical HUD state between 70 and 100%, to better
recognise very small amounts of damage"
- rscadd: "Medical huds will no longer show the healthbar on crewmembers
who are at full health"
- rscadd: "Added a healthbar fadeout effect for when someone heals up to
100% while you're watching"
- tweak: "Medical huds now update more frequently"
2016-06-23 02:16:06 +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
Ryan784
5f9018eeb8
Vampire Blood Immunity
...
Vampires will no longer take toxin damage from blood infusions,
regardless of the type of blood it is.
2016-02-02 18:21:45 -05:00
skull132
fe48f26d71
Porting forensics from Aurora.
2016-02-01 17:08:47 +02:00
Lord Lag
ee583b913d
Vaurca Update
...
Vaurca for ne code, now with better sprites
2016-01-20 19:50:19 +00:00
Zuhayr
4b356f5a36
Robotic limbs and non-DNA mobs will now respect gendered icons.
...
Conflicts:
code/modules/organs/organ_icon.dm
2016-01-14 08:44:21 +01:00
Chinsky
1c0ca68904
Now only removing one stump per replacement.
...
Which limb creates which wound isn't tracked anywhere, but eh, as long as number of stumps is sane.
2016-01-08 19:41:48 +03:00
Chinsky
46bcfd96f8
Changes to limb reattachment - now when limb is attached, wound from it not being there is removed. Because you know, it's there now. No more bleeding stumps with limbs already attached.
...
Also fixes limbs instahealing when cut / reattached. Wounds used to be Cut() to prevent fantom wounds but, it's not needed anymore because whole limb is removed.
Also moved moving organs inside replaced() since it was called next to it anyway, and not like you can replace organ without moving it to human. Also forceMove()
2016-01-07 23:10:02 +03:00
PsiOmegaDelta
9984d72ff6
It should now be possible to give species with blood IV, rather than species without blood.
2016-01-03 17:31:49 +01:00
ccomp5950
16ca56e197
Fixes #11885
2016-01-03 07:09:59 -05:00
PsiOmegaDelta
00b556e768
Merge pull request #11762 from Baystation12/dev-freeze
...
Dev
2015-12-27 16:10:04 +01:00
mwerezak
8b685fdf8f
Fixes #11380
2015-12-27 01:39:34 -05:00
PsiOmegaDelta
dbbb5d2e86
Merge pull request #11650 from Baystation12/dev-freeze
...
Dev
2015-12-10 08:29:06 +01:00
GinjaNinja32
1a46db4aaf
fix #11637
2015-12-09 17:04:24 +00:00
PsiOmegaDelta
185faaeb82
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/game/turfs/turf.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/mob_grab_specials.dm
2015-12-08 08:23:10 +01:00
PsiOmegaDelta
5fcf13ac55
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/surgery_limbattachment.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/organs/organ.dm
code/modules/organs/organ_external.dm
code/setup.dm
2015-12-08 08:09:37 +01:00
mwerezak
39ab31cbf8
Removes unused ORGAN_ATTACHABLE define
2015-12-06 04:34:33 -05:00
mwerezak
9135a609cb
Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468
2015-12-06 04:17:52 -05:00
mwerezak
5de9314803
Clears reference to parent when removing external organs
2015-12-06 03:57:15 -05:00
mwerezak
a7d80a93e5
Fixes mismatching diona internal organ tags
2015-12-05 23:39:16 -05:00
mwerezak
b12e094112
Removes unreachable return in organ/external/remove(), smaller embedded items are no longer deleted. Implants changed to w_class 1 because seriously a w_class 3 implant makes no sense at all.
2015-12-05 23:38:57 -05:00
mwerezak
92b47c94de
Makes organ/externa/attack_self() control flow easier to follow, handles embeded non-items
2015-12-05 19:19:39 -05:00
Zuhayr
7ff77f5079
Removes a leftover world <<
2015-12-02 18:21:09 +10:30
Zuhayr
1244c4a5fd
Porting forensics from Aurora.
2015-10-24 02:15:06 +10:30
PsiOmegaDelta
55f6c1c0b5
Merge pull request #11204 from Hubblenaut/medical
...
Bruise Packs, Changes and small Fixes
2015-10-19 16:17:16 +02:00
Hubblenaut
cbd0972bfa
Bruise packs are used per wound and take time to apply
2015-10-16 16:36:04 +02:00
Zuhayr
5dc6ff5da1
Merge pull request #11230 from PsiOmegaDelta/xenomorphs
...
Xenomorph update
2015-10-13 08:31:27 +10:30
PsiOmegaDelta
27feb09a31
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer/computer.dm
html/changelogs/.all_changelog.yml
2015-10-11 17:37:01 +02:00
PsiOmegaDelta
070ca0adea
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/holodeck/HolodeckControl.dm
code/modules/mob/living/carbon/breathe.dm
code/modules/mob/living/carbon/human/life.dm
code/setup.dm
2015-10-11 17:17:41 +02:00
