Commit Graph

1053 Commits

Author SHA1 Message Date
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
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
e0cbf33bde Cargo Fixes (#1087)
Fixes several problems and runtime errors related to spawning cargo stock and loot crates
2016-10-30 01:14:12 +03: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
NanakoAC
b5e554812b Cargo Warehouse Stock (#1045)
This PR is intended to make working in cargo more interesting, and more like a real warehouse experience. IE, the place is an aladdin's cave full of wierd knicknaks and useful oddifies.
2016-10-26 18:56:35 +03:00
LordFowl
ea0f8c48d9 Dick Tracy and the Technicolor Dreamcoat (#1035)
User Changelog

rscadd: "Gave detective a colourable trench-coat, solving the Dick Tracy Dilemma."
tweak: "Wooden closets now have a slightly larger capacity, indicative of their greater size."
2016-10-24 00:23:07 +03:00
LordFowl
660a5d0063 Miscellaneous Content Patch (#1002)
rscadd: "Added three new energy-based weapons, one designed purely for pest-control."
rscadd: "Added a new rare handpistol, based off of a proposed competitor to the NT Mk58."
rscadd: "Added a new pet for the Head of Security - the PTR-7 Tranquilizer Rifle."
rscadd: "Syndicate manhack delivery grenades are now available via the traitor uplink."
rscadd: "Manhacks will no longer attack anyone belonging to the 'syndicate' faction, including Heist pirates."
tweak: "Tweaked loadout customisation whitelists, generally making them more restrictive by role."
bugfix: "It is no longer possible to be older or younger than your species ought to be."
2016-10-22 23:26:42 +03:00
skull132
87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development 2016-10-07 00:58:39 +03:00
Bedshaped
00718dd632 Bedshape's fixes, 28SEP (#1021)
Fixes #884
Fixes #914
Fixes #996 
Fixes #998
Fixes #1005
2016-09-28 23:05:48 +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
Alberyk
e03cd89816 Adding the captain voidsuit (#912)
In this update:

Remove all mess that is the captain armor
Add a voidsuit version
Removes the extra armor from the locker
Fix them in the map
2016-09-15 12:06:52 +03:00
NanakoAC
2e0389ed19 Light Replacer Improvements (#772)
rscadd: "Light Replacers can now be used on a box of lights to automatically refill them."
rscadd: "Added an Advanced Light Replacer, creatable at science. It sucks up broken bulbs into an internal storage, greatly expediting mass-light-fixing"
tweak: "Custodial cyborg module now comes with an advanced light replacer."
2016-09-10 22:40:16 +03:00
Alberyk
080bf5c1cb Returning the old laser rifles, energy pistols, carbines and much more (#860)
In this update:

Returning old e-rifles from old code.
Changing regular energy gun to energy carbine
Adding back the energy pistol
Buffing a bit the heavy asset protection suit, and fixing more loadout related issues with the nt and syndicate assault teams
Reworked a bit the syndicate commando and deathsquad loadouts
Returning shotgun boxes, that works like speed loaders, from old code, now with unique sprites
Stun batons now emit light
2016-09-07 10:11:48 +02:00
NanakoAC
76e56f11a9 Exosuit Crash, Narrator and armor tweaks (#846)
changes:

rscadd: "Added a Crash ability to exosuits. Uses the suit's mass to attempt to break through obstacles, sustaining some damage in the process."
tweak: "Buffed Ripley exosuit armor values significantly, and durand armour slightly. Firefighter ripley also buffed, but is slower than base ripley."
tweak: "Greatly increased the health values of some high-security airlocks."
bugfix: "Airlocks, tables, girders and windows now behave a bit more consistently when exploded. All airlocks are a bit more resistant to explosions when bolted."
rscadd: "Added some more narrator voices to exosuits."
rscadd: "Added some warning sounds for exosuits when low on power, or badly damaged."
tweak: "The power drain of EMPs used on exosuits no longer scales with the cell. A better power cell can now survive more EMP hits. Drain level is a little lower for the starting cell."
tweak: "EMP damage against exosuits reduced by 20%"
2016-09-04 21:43:03 +02:00
SoundScopes
893398104f SoundScopes' bugfixes - 01SEP2016 (#848) 2016-09-01 20:45:18 +02:00
Alberyk
b66f5e0ef1 Implements Bluesecurity Icons (#815) 2016-08-27 18:21:34 +02:00
NanakoAC
75e13303ea Medical, borg and misc tweaks (#714)
tweak: "Tweaked surgeon cyborg modules: Added chemistry gripper, removed fire extinguisher, and added soporific to their hypospray."
tweak: "Removed chemistry gripper from crisis borg."
maptweak: "The chemistry and botany fridges are now see-through, so you can more easily chat with people on the other side."
tweak: "Cost of cyborg renaming module vastly decreased"
tweak: "Renamed medical's Chemical Closet, to Chemistry Equipment Closet. Nobody ever stores chemicals in an unrefridgerated closet."
rscadd: "Added two boxes of empty spraybottles to the chemistry equipment closet."
2016-08-15 19:51:23 +03:00
NanakoAC
eba855d423 Fixes #643 (#649) 2016-08-02 21:46:57 +03:00
Alberyk
83ed43896e Allowing energy weapons and chainswords to slice apart regular walls (#645)
All energy weapons and chainswords can slice apart regular walls, as suggest in the forums, sometime ago.
2016-08-02 21:46:35 +03:00
NanakoAC
d1f79a6168 Janitor slot and janicart tweaks (#612)
Adds an extra janitor slot and some mapping work to support it, reworks the janicart a fair bit.

changes:

rscadd: "Increased number of janitor slots to two."
rscadd: "Janitorial carts can now be constructed with metal sheets, and deconstructed with a wrench, welder or plasmacutter if empty."
tweak: "Janicarts now come without a bucket. Click and drag a mop bucket onto a cart to mount it, and you can unmount it from the janicart interface."
tweak: "Placing a mop into a janicart, and pouring containers into the bucket, is now done with alt-click. A leftclick will now always wet the mop, and throw objects into the trashbag, respectively."
rscadd: "Janicarts can now be climbed over like tables - Click and drag your sprite onto it."
tweak: "Custodial closet's Spraycleaner, cleaning grenades, and spare lights, are now inside the janitorial locker instead of on table/floor."
tweak: "Added an extra janitorial locker in the custodial closet."
bugfix: "Fixed the Captain's deluxe soap being unuseable for cleaning"
tweak: "Soap can now clean more tiles when wetted"
tweak: "Soap and rags can now be wetted in buckets, mopbuckets, watertanks and janicarts"
2016-08-02 21:42:48 +03:00
Alberyk
fef1c0181b Adding the .38 back to the detective locker (#504) 2016-08-02 21:39:45 +03:00
Alberyk
624e5bfd2f New firesuits sprites and atmos firesuits (#582)
New and better sprites, from old code, for firesuits as a whole and adding atmos firesuits and fire helmets.
2016-07-24 23:51:22 +03:00
LordFowl
a6c1085e37 Fowl's Bugfixes 1 (#521) 2016-07-10 01:13:29 +03:00
Alberyk
8ff246ae13 Adding more barsigns (#421)
Adding more barsigns sprites that the bartender can select.
2016-06-23 02:19:03 +03:00
Alberyk
bfcb0a4207 Adding military and janibelts (#391)
* Adding military and janibelts

Adding the syndicate and janitor belts from the old code.

* Belt sprites

* Adding more sprites

* Adding changelog.

* Adding the janitor belt to the janitor's locker

* Mercenaries start with the belt on spawn

Because I have no idea how to merge map things.
2016-06-20 17:53:44 +03:00
skull132
17938853d5 Of Helper Procs & Dumbs
Makes a mob/proc/can_use_hand(), which determines whether or not a mob can use a given hand.

Redefined in human.dm to check a hand's status and usability.
2016-03-25 20:33:10 +02:00
skull132
39303fbcec Merge pull request #113 from skull132/master
Hotfix Roundup
2016-02-11 21:17:52 +02:00
skull132
4fd56183fc Can Pick Vox 2016-02-11 20:54:00 +02:00
FelisCorax
5e4e000a28 emptying reagent containers in sink
filling/emptying syringes from sink
2016-02-08 21:39:08 -05:00
PsiOmegaDelta
183d8cbd3a Makes the into-resist proc solely responsible for checking click delays.
Because it sets the click cooldown itself downstream procs fail when they in turn check the click delay.
Fixes #11839. Fixes #12062. Fixes #12114.
2016-02-05 10:37:09 +01:00
Ccomp5950
bd60099a7e Removes unused pressure_resistance variable.
This is used with FEA not ZAS

Though it's kind of funny to look at what some of these values were set at.
(For reference: ONE_ATMOSPHERE = 101.325)
2016-02-03 18:17:52 -05:00
Ccomp5950
6cf7cbd933 Merge pull request #11988 from PsiOmegaDelta/160115-IAmALittleBitSpecial(InTheHead)
Makes special role preferences a list, instead of flag entry.
2016-02-02 15:26:09 -05:00
skull132
fe48f26d71 Porting forensics from Aurora. 2016-02-01 17:08:47 +02:00
Dennok
622d119352 cut var/obj/machinery/door/new_airlock 2016-01-31 02:20:35 +02:00
Dennok
ce89409ff6 remove new_airlock.dir = src.dir 2016-01-31 02:10:07 +02:00
PsiOmegaDelta
654f2ccaa0 Makes all special role entries use unique ids now that it is possible. 2016-01-30 17:22:17 +01:00
Hubblenaut
88f2e5b73a Wheelchair fixes
Conflicts:
	code/modules/mob/mob_movement.dm
	icons/obj/rollerbed.dmi
2016-01-28 12:07:40 +01:00
Mloc
7bc2432ce3 fixes #11461
Signed-off-by: Mloc <colmohici@gmail.com>
2016-01-22 21:09:58 +00:00
PsiOmegaDelta
1210a6e42f Adds the moved event.
Allows movable atoms to follow other movable atoms, as quickly as BYOND allows. Also supports following atoms inside other atoms.
However, this only works fully when Move() or forceMove() is utilized. Setting loc directly will not raise the moved event.
2016-01-18 20:16:48 +01:00
Techhead0
62540b5b8c Fixes #11833
If you were holding the sheet, they would spawn inside the mob, irretrievable.
2016-01-16 14:27:07 -05:00
PsiOmegaDelta
b74f2baf6d Makes special role preferences a list, instead of flag entry.
Allows us to define more than 16 special roles.
Updates some role usages to use the new ghost trap system.
2016-01-15 11:34:00 +01:00
Ccomp5950
92ba35fadd Merge pull request #11985 from GinjaNinja32/wingrille
fix wingrille spawners allowing initial ZAS init to expand zones through them
2016-01-15 00:33:45 -05:00
GinjaNinja32
06dd8010f3 fix wingrille spawners allowing initial ZAS init to expand zones through them 2016-01-15 00:16:22 +00:00
Ccomp5950
cdc556f131 Merge pull request #11969 from comma/directions
Direction signs 2 : Generic Bogaloo
2016-01-12 02:29:25 -05:00
Chinsky
4a6056b945 Adds generic direction sign. 2016-01-12 09:42:06 +03:00
GinjaNinja32
f7ec85e0f0 Merge pull request #11933 from comma/mirrormirror
Handheld mirror
2016-01-08 22:09:22 +00:00
Chinsky
c3b3f6e546 Adds Destroy to both handheld and wall mirrors 2016-01-08 02:07:29 +03:00
Chinsky
8471813406 Adds a handheld mirror that can change hairstyles. 2016-01-07 21:17:31 +03:00
PsiOmegaDelta
1b564bb179 Map and icon tweaks.
Re-adds medical examination wall and chapel mass driver button.
Ensures that the chapel crematorium button does not lose its default icon on icon update.
Fixes #11915. Fixes #11894.
2016-01-07 11:56:06 +01:00