Commit Graph

22685 Commits

Author SHA1 Message Date
Werner
ab413348ff Baymerge fixes (#12)
* Fixing compile errors

* Some more fixes

* Some more fixes
2016-11-19 11:56:49 +02:00
Alberyk
908fc933f9 Fixing more error and the return of banhammer (#10) 2016-11-18 23:03:56 +02:00
Werner
3e92d63ddf Fixing compile errors (#9) 2016-11-18 18:03:27 +02:00
skull132
effb9ececf Processor defines & whitelist fix
Removed the inefficient Bay method of handling ayylmao whitelists.
2016-11-12 14:31:09 +02:00
Alberyk
38a0033b2e Fixing compile errors (#8)
* Fixing more errors

* Update baystation12.int
2016-11-12 12:47:43 +02:00
skull132
f75e1f3cca Indentation clearance + basic compiles
Due to missing includes, primarily.
2016-11-12 01:02:50 +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
ad1042d033 Development Fixes - 06NOV2016 (#1120)
Fixes the mousebeam for more gibbings and ensures that nowhere is safe.
Fixes the multipliers because fuck.
Makes the night lighting process not runtime if night lighting is disabled. Note to Bed: del()-ing processes is bad, they should be disabled instead.
2016-11-06 20:14:38 +02:00
skull132
faf81f15a1 Implement speed modifiers (#1119)
Because linear addition does not retain proportional relationships! Mulipliers should take care of that, though, surely.
2016-11-06 15:07:50 +02:00
NanakoAC
ca1f0b51db Nymph draining fix (#1114)
Fixes nymphs being able to kill people by repeated blood sampling.
The amount drained will gradually drop off and never bring blood below half
2016-11-06 14:00:46 +02:00
skull132
0b6120c1ac Server Greeting Refactor (#1034)
Refactors the Server Greeting datum to do majority of the processing clientside. No longer will we be holding massive spans of text in memory, and looking over them for shits and giggles.
2016-11-06 13:59:22 +02:00
Alberyk
dae995ba04 Random items fix and small touches (#1115)
fixing a runtime with random maint loot
some additions I left out of heist in my previous prs
2016-11-04 23:58:37 +02:00
skull132
9a4c6343e7 Merge branch 'master' into development 2016-11-04 14:19:38 -04:00
NanakoAC
27e1d8f8c6 Sprint and Vehicle fixes(#1113)
A number of bugfixes and under-the-hood tweaks. Nothing here needs changelog, and shouldn't really be noticed by players:

Fixes vehicles using stamina or moving faster when in sprint mode.
Fixes getting footstep sounds when driving a vehicle.
Changes cargo trains to use forceMove instead of move, for towing cars behind them. This fixes an issue where the train would become disconnected if the engine moved too fast.
Completely divorces vehicles from using mob speed vars at all, speed is defined on a per-vehicle basis.
Removes knockdown from sprinting exhaustion. Characters will now stop sprinting before they collapse.
2016-11-04 21:18:40 +02:00
Bedshaped
d8a49afaf9 Night lighting (#1049)
changes:

rscadd: "Added a button on APCs to set the area lights to a 'night-mode' which is dimmer and saves energy."
rscadd: "Added an automated system to turn 'night-mode' on in hallways between 6pm and 7am in station time."
2016-11-04 01:19:39 +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
Alberyk
406c44c0e3 Changes to combat borg availability (#1104)
Locks combat borg behind an extra keycard swipe thing, and a research upgrade, but, they can still be enacted via code delta or admin bus.
2016-11-03 00:26:57 +02:00
skull132
7ec9dfa156 Fixes #1103 & discord spam (#1106)
Fixes the robot FT saving issue and the discord spam that comes from BOREALIS using @here for CC messages. To be fixed more thoroughly in dev.
2016-11-02 22:38:05 +02:00
Alberyk
e683fbe325 Chief engineer's hardsuit upgrade and more missing map things (#1096) 2016-11-02 21:18:31 +02:00
Werner
2590f4b7e2 Price change per jackboots request (#1099) 2016-11-01 11:03:48 +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
Bedshaped
f8147dc1c6 Mag lock changes (#1050)
changelog:

rscadd: "New implementation of magnetic door locks, can be found in armory and eng secure storage."
soundadd: "Added hydraulic servo sounds."
devchangelog:
New helpers

Added check_neighbor_density(turf/T, var/dir) which checks if anything dense is on a tile next to T and return 1 if it is
Added is_type_in_view(var/type, var/dist = 0, var/center = src) and is_type_in_oview which will make a list from view and and return 1 if something matches the declared type
2016-10-30 22:54:18 +02:00
skull132
312ed30bf9 Merge branch 'master' into development 2016-10-30 13:18:37 -04:00
Alberyk
122f1e0ebe Fixing missing posters and new additions (#1093)
Adds some new posters
Fixes #1078
2016-10-30 20:12:31 +02:00
inselc
f11deb5f91 Bugfixes: hungry shades, IV drips, PDAs, smallbots and laptops (#1088)
Fixes #1082 
Fixes #1081 
Fixes #979 
Fixes #1063 
Fixes #874 
Fixes #1006 
Fixes #1063 
Fixes #929
2016-10-30 15:17:42 +02:00
skull132
3c0e49a957 Merge branch 'master' into development 2016-10-30 06:19:56 -04: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
LordFowl
415096c035 Map patch for Dev (#1086)
As discussed in dev-chat - reactionary patch to a percieved issued in the development update - Nanako's mapping changes overrode my own.
2016-10-30 01:12:20 +03: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
15cad446e6 Merge branch 'master' into development 2016-10-29 11:47:42 -04:00
Alberyk
6e7becf0b8 Custom items - 24/10 (#1064)
Heart Condition Implant - Ziva Ta'Kim - sierrakomodo
Worn Badge - Caleb Greene - notmegatron
Pressing of Messa's Tears - Poslan Kur'yer-Isra - jboy2000000
Pressing of S'Rendarr's Hand - Poslan Kur'yer-Isra - jboy2000000
Twin Suns Throw-over - Poslan Kur'yer-Isra - jboy2000000
Xenonuerology Doctorate - Alexis Shaw - tenenza
2016-10-29 18:41:57 +03:00
NanakoAC
019884cbc3 Explosion and other tweaks (#1077) 2016-10-29 17:44:46 +03:00
inselc
7443629d82 Bugfixes: Welding tool, Constructs, Runes (#1072)
Fixes #1066 
Fixes #1065 
Fixes #1053
2016-10-29 14:46:19 +03:00
Werner
9d074976a0 Fixes the telebaton (#1074) 2016-10-28 03:20:36 +03:00
NanakoAC
d09e24a348 Cargo Map Fix (#1071)
Fixes the missing mapwork with the cargo bay
2016-10-27 21:05:50 +03:00
Alberyk
68c34b4a99 Dragunov button fix and new wishgranter (#1069)
-fixing the missing dragunov button
-adding the final version of the new wishgranter, with new sprites, lights and etc.
2016-10-27 20:27:11 +03:00
Werner
609139ea31 Temporary Lore Price Hike (#1070)
Apparently working with other teams is a thing we do. Prices for vending machine items changed for lore reasons. Temporarily. Or so I'm told.
2016-10-27 00:44:14 +03:00
Fire-and-Glory
0fde5b9f63 Kneebreaker Hammer and ported biosuits (#1067)
Adding the Kneebreaker Hammer to the code, a blunt weapon which does the same amount of damage as a metal baseball bat and can be used to pry doors while fitting in a satchel and on the belt, quite comparable to an e-sword, due to eventually become a traitor item when the coders are done with Stuff.

Porting our oldcode biosuits as well, when I made some checks, those who chose to comment unanimously agreed the old suits were better.
2016-10-26 22:01:11 +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
Alberyk
479666a47d Random maint loot and miscellaneous things (#1052)
Things done:
Created several random objects, that can be used to randomize loot in the maint or other places. Several items, some rare things and other random useful or not objects.
Added a svd gun with its own snowflakness, to replace the heister's lwap, but, they will get an extra energy gun to compesate.
Added tracksuits, stunrod, new sprite for the rapier, a new sword flavor and the old cane sword.
Changed the heister ship armory; two random melee weapons, the dragunov with an extra mag and a random energy gun.
Changed the chances of ghetto guns going bad.
Replaced the carbines in the ert area with energy pistols, so, they can make use of the holsters.
Clumsy people may have trouble with glowsticks now.
2016-10-26 20:29:38 +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
NanakoAC
c4b36a5490 Sprinting, Stamina and Temporary Modifiers (#1030)
Introduces:
- Temporary modifiers process and datums for that
- A new stamina and sprinting mechanic. That is in need of further development! Weee!
2016-10-26 18:22:39 +03:00
OneOneThreeEight
a3f051693d increase telebaton (#524)
Buffs telebaton to original values. Tested already: it works well enough.
2016-10-24 00:23:55 +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
inselc
57f03923dc NanoUI updates for PDA Power Monitor and Sleeper Consoles (#1043)
This PR contains some UI updates for the PDA Power Monitor and the Sleeper Consoles (mostly a result of me trying to get a grasp of DM).

updated PDA Power Monitor UI. Sensor readings page now uses new icons and shows powernet load.
updated Sleeper Console to use fancy NanoUI. Added sanity checks for user interaction.
2016-10-24 00:22:55 +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
NanakoAC
749b048071 fixes compile errors related to meteors (#7)
I don't think ive done pushing correctly, this PR took 10 minutes to push to remove which definitely seems wrong

In any case, fixes four compile errors related to meteors in the baymerge PR, and also fixes meteor events - A single line had been removed which would cause meteors to not spawn.

I removed a defunct function from one of the meteor files, because its no longer referenced or needed anywhere in live code, and its the only place the now-removed wavesecret var was being referenced.

No idea why meteor.dm was trying to pass two vars into the spawn_meteors proc, since afaik its never taken more than one input, and the variable it was trying to pass in doesn't exist. I reverted it back to our normal behaviour, passing in a value of 6, although this doesn't seem correct either, it is at least what we currently have and thus not a change
2016-10-18 16:01:00 +03:00
skull132
95acdacaf9 Fix API whitelist (#1061)
Fixes the config.api_rate_limit_whitelist to have proper true values associated with the indexes after startup. This way, the index grab method of checking for a list entry (which the api_do_auth_check proc uses) works.
2016-10-17 12:22:27 +03:00
Werner
774ab1a43b Some bug fixes (#5) 2016-10-17 11:09:23 +03:00
Alberyk
80b3070547 Fixing more errors (#6) 2016-10-17 11:09:14 +03:00