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
Bedshaped
72d95543f9
skull_is_a.git
2016-11-11 22:18:30 +00: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
Bedshaped
dc458a2d5e
Finished
2016-11-11 22:08:39 +00: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
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
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
skull132
87e041aa75
Merge remote-tracking branch 'bay12-upstream/master' into development
2016-10-07 00:58:39 +03:00
skull132
759c463a2c
BOREALIS 2 Implementation ( #938 )
...
Removes BOREALIS I.
Implements HTTP POST requests, credit to Oisin100 from Yogstation13 for the ByondPOST.dll.
Implements the BOREALIS II datum and converts all calls to reroute to that.
Adds round logging to channel_announce channels.
2016-09-18 23:28:01 +03:00
skull132
c749c18b93
Better Runtime Logging ( #913 )
...
Introduces a few updates from /tg/station13 with regards to runtime logging, and then modifies the runtime logging code to work properly. Developers now have access to both condensed and uncondensed runtime logs, with the former being updated at the end of each round.
2016-09-12 21:19:45 +03:00
Werner
fb25382405
Rewrite API ( #825 )
...
he /world/Topic() API has been rewritten.
General function:
The API is initialized upon roundstart and generates a list of possible api requests from /code/datums/api.dm
Once a request is made the following checks are performed:
If a query parameter is set (the function that should be called)
If the ip is ratelimited (or rate-limit-whitelisted)
The query is authenticated against the db using ip, function and key
If these checks pass, it is validated that the api command exists
Then the api command is called, all supplied params are passed through
Each API function returns 1 no matter if it failed or succeded
Additional info is provided in the statuscode, response and data vars
The statuscode, response and data are send back to the caller (through list2params)
The data var is json encoded before sending it back
This is not backward compatible to the current API
Current API Clients need to be updated
2016-09-04 21:41:44 +02:00
skull132
c331042b9c
Antag Competition Implementation ( #703 )
...
Nominating for worst code 2016
Adds in custom objectives for the antag competition
Adds in a verb for players to assign their character's allegiences and to later edit them
Adds in a verb for players to request objectives relating to the contest
Adds in the logging of contest results
Modifies the objective system to facilitate objectives that require regular checking (such as the brigging one, which was not functional up until now)
2016-08-09 01:36:21 +03:00
skull132
67310b42db
Fixing Dumbs ( #561 )
...
Reverts baystation12.int that I fucked up
Adds a config toggle to host the dev server without clogging up SQL tables
2016-07-12 15:48:18 +03:00
skull132
83253fc1f7
Chat markup ( #441 )
...
Enables you to use Skype/Discord style mark-up in OOC, LOOC, and IC chat.
2016-06-23 16:44:33 +03:00
skull132
b70cbfac22
Version Bump to 510.1347 ( #438 )
...
Updates the TravisCI config to use the latest stable BYOND release.
Adds client version control taken from /TG/station.
Updates the recommended version for hosting.
2016-06-23 14:45:15 +03:00
skull132
02b42862c1
processScheduler Update to 510 ( #398 )
...
Updates code to be 510 compile compatible.
Also introduces the new updates to the GOON processScheduler, which should make for better gameplay and less lag. Specially on high population.
2016-06-23 02:47:12 +03:00
skull132
d3d53a9c4d
Config Age Restrictions ( #437 )
...
Backports the old age restrictions system from old code. Age restrictions can now easily be applied by simply modifying a text file.
2016-06-23 02:13:43 +03:00
skull132
7dacaa28dd
SQL Saving - Rewrite + Implenetation ( #350 )
...
Rewrite's Mahzel's SQL character and preference saving.
Introduces easy config switching between the new and old system, with no troubles at all.
Also introduces better logging for DBQuery/proc/parseArguments(), should something go wrong. And classes SQL query errors as full on error snow, as opposed to debug data.
2016-05-30 23:39:07 +03:00
skull132
8b5c7bc2c5
Conflict resolution
...
Merge remote-tracking branch 'Aurorastation/development'
# Conflicts:
# config/example/config.txt
2016-03-25 22:25:41 +02:00
skull132
5b147ac05b
Voting Overhaul
...
Transfer vote delay is counted from vote end, so it doesn't conflict with invalid or cancelled votes. Or other votes.
TRANSFER_TIMEOUT added as a config option, default value is 2 hours. No transfer votes before 2 hours.
Transfer votes before 3 hour mark require 2/3rds majority to pass again. Credit to SoundScopes for the original snippet.
2016-03-25 16:09:03 +02:00
skull132
a5cb959166
Remove config.webint_enabled
...
Depracted in favour of using config.webint_url in general. Just checks if it's defined, and if so, we'll consider it active and in use.
2016-03-21 23:06:02 +02:00
skull132
61e93b1d79
Naming Standardization
...
webint shall be the common word used now, replaced all instances of webinterface or webAPI with that one phrase. Should make it easier to read and search.
2016-03-07 19:01:03 +02:00
skull132
8c30b617e3
Webinterface Config Settings
...
Configuration settings for using the webinterface in future updates.
2016-03-05 00:53:36 +02:00
skull132
202b216092
More reworking of DB handling
...
sqllogging depracted in favour of config.sql_enabled. Database loading is done through /hook/startup/proc/load_databases, with initialize_database_object() being a generalized proc to read any generic database config file. (TODO: config examples in relaiton to last remark.)
2016-03-04 01:41:44 +02:00
skull132
44f2121042
Remove forumdb
...
Unused object and vars. Cleans them up, as well as removes the config file.
2016-03-02 22:44:00 +02:00
skull132
121d4fcdd7
Discord over IRC
...
Converts and replaces all IRC centric procs, vars, etcetera, into discord centric ones.
2016-02-16 17:42:00 +02:00
skull132
8569d1c1ab
+CCIAA Flag
2016-02-02 23:37:15 +02:00
skull132
be642de482
SQL based player whitelisting
2016-02-01 15:34:24 +02:00
skull132
09a6c86180
Remove dbcon_old
...
Removes the redunant SQL database and swaps the core mechanics over to using one database for all the things.
2016-01-13 15:56:57 +02:00
PsiOmegaDelta
4f6ebf9a43
Adds a config option to automatically delist the server from the BYOND up when there are no admins.
2016-01-13 08:05:49 +01:00
Sebastian Broberg
10640b172d
Alien Whitelist SQL version
2015-12-31 10:56:04 +01:00
GinjaNinja32
8303404678
Merge pull request #11553 from PsiOmegaDelta/151201-RandomLobby
...
Adds the ability to have random lobby screens.
2015-12-01 23:58:08 +00:00
PsiOmegaDelta
a32be3f359
Adds the ability to have random lobby screens.
...
A random lobby screen is now picked at server start, and presented to all players. Sadly in our case we currently only have one every day lobby screen.
Port of https://github.com/PolarisSS13/Polaris/pull/321 , with added sanity checking.
2015-12-01 15:55:18 +01:00
Zuhayr
e5ec6c761b
Adds a possession system for ghost mousedrop(). Currently allows for control of mice, drones and use of drone fabricators.
2015-11-23 05:52:33 +10:30
Chinsky
a287e47c28
Merge pull request #11364 from PsiOmegaDelta/151024-Btime
...
Scheduler now uses btime, and other improvements.
2015-11-19 10:14:03 +03:00
Chinsky
ae91bdbab6
Merge pull request #11328 from PsiOmegaDelta/151017-DelayedAntag
...
Adds antagonism minimum player age.
2015-11-19 10:07:57 +03:00
PsiOmegaDelta
6f559779b5
Additional respawn refactoring.
...
Removes a non-utilized config setting.
Adds a config setting to set the respawn timer, defaults to 30 minutes as today.
Makes the MayRespawn() proc utilize this config setting. Makes more uses of MayRespawn() check the respawn delay.
2015-11-08 20:05:37 +01:00
PsiOmegaDelta
88d85c16fa
Scheduler now uses btime.
...
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1540 .
2015-10-24 12:53:04 +02:00
PsiOmegaDelta
5c40db0fad
Adds antagonism minimum player age.
...
Round-start and mid-round auto-antagonism selection can now exclude players if they have not reached a given minimum age requirement.
Can be enabled/disabled by config, is disabled by default.
2015-10-17 20:39:02 +02:00
Zuhayr
63cb207eb8
Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys
...
Languages now use alternative prefix keys.
2015-09-06 17:20:51 +09:30
PsiOmega
95b12da391
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/gamemode.dm
code/game/antagonist/outsider/ert.dm
code/game/gamemodes/ninja/ninja.dm
2015-09-05 09:35:02 +02:00
PsiOmega
69fde6af03
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/objects/items/robot/robot_parts.dm
code/setup.dm
2015-09-05 09:24:30 +02:00
Zuhayr
a0187f66e3
Fixes Secret.
2015-09-05 14:12:20 +09:30
Zuhayr
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
PsiOmegaDelta
85f32efa7a
Players can now select their own language shortcut keys.
2015-08-26 15:15:54 +02:00
PsiOmegaDelta
5962656c1e
Languages now use alternative prefix keys.
...
Makes radio and language key overlaps possible.
It is possible to configure the default language keys server side.
Pending: The possibility for players to configure their own language keys.
2015-08-26 13:17:57 +02:00
Kelenius
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
PsiOmegaDelta
5cbb703609
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/jobs/access.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/update_icons.dm
code/modules/organs/organ.dm
code/modules/reagents/Chemistry-Holder.dm
code/setup.dm
2015-07-27 10:20:20 +02:00
Zuhayr
e0429af2f7
Added config option for initial brain organ health.
2015-07-27 15:33:54 +09:30
