7375af6c19
Minor Nightmode Fixes ( #1305 )
...
bugfix: "Global nightmode toggle no longer affects security as was originally intended."
tweak: "Manually turning on nightmode will prevent the automatic system from turning it off."
2016-12-26 01:42:40 +02:00
70ad90663b
Nightmode Fixes ( #1293 )
...
rscadd: "Added a night-mode control program for the Chief Engineer."
tweak: "Changed how night-mode works internally."
tweak: "Red alert now disables night-mode."
spellcheck: "Slightly changed alert messages."
Fixes #1200
2016-12-25 20:10:46 +02:00
5ccb627531
BayMerge Bugfix; Fixing guns, update computers. ( #1263 )
...
Fixes all the snowflake guns unique to our codebase with multiple firemodes so that they now actually behave correctly. Fixes a few bugs relating to computers, and updates modular_computers to use holoscreens.
2016-12-21 21:48:04 +02:00
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
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
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
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
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
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
87e041aa75
Merge remote-tracking branch 'bay12-upstream/master' into development
2016-10-07 00:58:39 +03:00
3c693545a1
Powercell and Charging tweaks ( #796 )
...
changes:
bugfix: "Newly protolathed/fabricated power cells now spawn with no charge."
rscdel: "Added entropy to all cell-charging operations."
tweak: "Most chargers are now faster. Cyborg charging stations are significantly slower."
bugfix: "Fixed newly spawned cells showing the incorrect charge state."
2016-09-04 19:43:40 +02:00
3979c813ca
Fixes #117 , Fixes #118 , Fixes #667 ( #668 )
2016-08-03 22:33:06 +03:00
148afa660b
Broken APC Welding ( #632 )
...
A quality of life improvement for synthetics mostly - Allows broken APC covers to be removed with a welding tool. Since synthetics generally don't have the luxury of picking up a fire extinguisher to bash it.
2016-07-24 23:55:55 +03:00
0fbac152d9
APC Description Fix ( #581 )
...
Fixes a tiny bug where the description of an APC is duplicated if you examine it at close range. Also fixes a couple typos and grammatical errors
2016-07-24 23:50:41 +03:00
443a49a49b
Merge branch 'master' into development
2016-07-10 14:25:54 -04:00
8dfb08dab1
Fixes #549 ( #551 )
...
Lessons were learned.
2016-07-10 21:49:57 +03:00
30b6aff6cf
Radio Jammers ( #502 )
...
Adds radio jammers for antags and improvised version as well.
2016-07-09 03:14:04 +03:00
242dbc3f6a
Tesla Standardization
...
Brings the tesla interaction code inline with Bay12's base.
2016-02-21 22:24:14 +02:00
1106cd7c1f
Fixes #124
...
Vaurca use name instead of a flag for mechanics.
2016-02-15 16:14:33 +00:00
9c7a149481
Fixes #12046
...
- Now uses percentage instead of fixed value when determining whether charging at full capacity, or only partially.
- Adds new overlay for "Disconnected or No Charge" output status. Outputting overlay is now displayed correctly.
2016-01-26 13:44:09 +01:00
912fe7356e
Merge remote-tracking branch 'Aurorastation/development' into new-engine
...
# Conflicts:
# code/__HELPERS/unsorted.dm
2016-01-24 23:25:08 +02:00
f976e82c63
Fixes the singularity expansion message.
...
A simple flip of a character. Fixes #11983 .
2016-01-22 08:45:07 +01:00
ee583b913d
Vaurca Update
...
Vaurca for ne code, now with better sprites
2016-01-20 19:50:19 +00:00
0009eff042
Compile Fixes
...
The engine is now mostly operational and should be working. Still need to check it's ability to produce power, that might not work. Or maybe it does. Dunno!
2016-01-18 21:50:30 +02:00
5a09ad45a0
Tweaks
...
- Implements github suggestions
- Fixes one SMES that had incorrect settings from previous change.
2016-01-15 07:52:33 +01:00
5de3f05ae1
Initial Commit
2016-01-13 14:25:06 +02:00
ad30a3a19e
SMESs no longer output by default
...
- Exception to this are SMESs that are intended to output - engine room, AI core, atmospherics, telecommunications, all asteroid outposts. This is why map changes had to be made.
2016-01-12 21:50:17 +01:00
2220ad7c56
SMES Load Balancing
...
- SMESs will now try to balance their inputs and outputs. This will correct the situations where some SMESs charge at full rate, starving other SMESs who are trying to charge from the same power net. In terms of output, multiple SMESs (such as, solar SMESs) will try to provide equal amount of power to the powernet.
- SMESs processing is now slightly different. UI now displays a "Disconnected or No Charge" error when the SMES does not have cable connection to output to, or when stored charge is zero. Once this problem is resolved (either by charging the SMES or by connecting it via wires) it will automatically begin outputting again.
- The only tiny bug i have registered so far is related to number precision. It is possible that powernets may gain or lose few watts (talking about 1-5 watts per powernet at most, it is negligible)
2016-01-12 21:38:23 +01:00
95ea641714
SMESs will no longer turn themselves off when they run out of power
...
- Instead, they simply won't output until some power is regained.
- This prevents, for example, solar SMESs from shutting down when they reach zero charge when the array is shadowed by the station. The SMES simply won't output any power until the array begins generating again.
2016-01-12 16:35:17 +01:00
87f645a267
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2016-01-11 07:51:07 +00:00
9b449cc183
Merge pull request #11963 from Baystation12/master
...
Dev-freeze
2016-01-11 08:28:56 +01:00
a00a6ae0e6
Fix #11955
2016-01-10 22:12:12 +00:00
cbcd5ab035
Map fixes - Dev Edition
...
- See #11658 - this is just edition for Dev
- TLDR version: Fixes power alarm at construction site, fixes emitter button giving errors about not being connected to cable, unanchors emitters at mining outpost by default.
- Added subtype for inactive APCs as per PsiOmegaDelta's request
- Fixed gridcheck affecting telecommunications central compartment.
2016-01-07 12:34:38 +01:00
6e82dfa381
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2016-01-04 19:25:36 +08:00
b22d7c58bb
Makes it possible to connect to cable nodes on shuttle plating.
...
Fixes #11852 .
2016-01-03 12:49:27 +01:00
7dc9b3487a
Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
...
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
da0a4c47cf
Merge pull request #11756 from Baystation12/master
...
Dev-freeze
2015-12-26 11:58:42 +01:00
faec92b553
Can now join compatible cable coils of any type.
...
Partial backport of #11656 . Fixes #10935 .
2015-12-25 11:19:59 +01:00
6736fb54e7
Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
2015-12-17 20:25:36 -05:00
1a8fc50f1e
Removes suicide code.
2015-12-14 15:57:56 +01:00
21f8c4aef1
Merge pull request #11645 from PsiOmegaDelta/151209-CableRainbow
...
Now possible to change cable coil color using a multitool.
2015-12-12 02:54:49 +03:00
e0c092fc54
Cleans up the previous commit's use of stacktype.
2015-12-11 11:18:27 +01:00
6b37b860d7
Fixes subcategories of cable coils not being mergeable
2015-12-11 11:09:11 +01:00
d43cf313c0
Relocates color definitions. Lowercases color definitions.
2015-12-09 21:49:58 +01:00
abcd965dde
Now possible to change cable coil color using a multitool.
...
Obviously using the same methods that borgs use to change the cable coil color internally.
2015-12-09 20:20:28 +01:00
1921c35231
fix issues with indented absolute path definitions
2015-12-09 14:12:54 +00:00
cbf51f9c73
Merge pull request #11605 from mwerezak/click-cooldown
...
Adds click cooldowns
2015-12-07 19:56:23 +03:00
8c6011de3f
Merge pull request #11588 from PsiOmegaDelta/151204-DisposalsEverywhere
...
Fixes floors not hiding all intended objects.
2015-12-07 19:55:54 +03:00
c9b7a8ece3
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.
Conflicts:
code/game/area/Space Station 13 areas.dm
2015-12-06 14:01:21 -05:00
b89e19e5a5
Merge remote-tracking branch 'upstream/dev-freeze' into dev.
...
Conflicts:
code/datums/datacore.dm
code/defines/procs/records.dm
code/game/machinery/camera/camera_assembly.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/mob/language/station.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
code/modules/surgery/organs_internal.dm
html/changelogs/.all_changelog.yml
2015-12-06 11:48:20 +01:00
Lohikar