635013f331
Merge branch 'virgoMaster' into virgoPull
2018-06-10 12:33:29 -07:00
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
6b4be2d7a8
Paranoid logging and byond account age
...
Adds the PARANOIA_LOGGING setting to config.txt (and PANIC_BUNKER which was missing for some reason) and updates example.
PARANOIA_LOGGING (also available as a verb for admins in Server) begins notifying admins of any 0day byond accounts, or users who have never joined before. For when you don't quite want to panic bunker.
Also makes this information available in player panel. Requires SQL connection.
2018-05-22 23:03:53 -04:00
ace0058b1f
Merge branch 'virgoMaster' into virgoPull
2018-03-21 21:22:51 -07:00
3a26426ae3
okay im done
...
it's a environment issue i think
2018-03-21 16:23:54 +00:00
c45971bd00
BOT ATTEMPT 3 ELECTRIC BOOGALOO IM LOSING MY PATIENCE HELP
2018-03-21 15:14:48 +00:00
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
6bc422ff5e
Ported VOREStation/VOREStation#461 - Allow greater customisation of wiki links
2018-01-17 16:46:48 -05:00
10b2cc7eef
Multiple loadout slots ( #4530 )
...
* Multiple loadout slots
Ported from Bay. Each character can have 3 (number can be overridden by config) loadout slots. This way, you can have different outfits for different situations without needing to have a separate character slot or edit your loadout every time.
Tested here, works as intended. The current loadout is set as slot 1, so you don't need to worry about remaking it. This also ports the to_file and from_file macros to make it work, I'm assuming they could later be used elsewhere as well.
* Log of Changing
2018-01-14 14:47:47 -06:00
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
cad5ef12e7
Does work on the event manager role again
2017-10-18 20:00:01 -05:00
4459d7087a
Revert "Does more prep for the Event Manager role"
2017-10-04 18:33:34 -05:00
c2c6b5949a
Does more prep for the Event Manager role
2017-10-02 21:51:48 -05:00
69a50ec225
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609
...
# Conflicts:
# code/_macros.dm
# code/controllers/master_controller.dm
# vorestation.dme
2017-06-09 22:54:16 -04:00
411e442fdd
Increases the radiation protection modifiers
2017-06-10 00:23:52 +01:00
b9007d11a8
Merge pull request #3493 from VOREStation/just-stonedmc
...
Port of StonedMC master controller framework
2017-06-04 16:15:13 -05:00
197a648795
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
90dff0ae63
Ports /tg's StonedMC Subsystem from Baystation12
...
* Partial port of @PsiOmegaDelta's https://github.com/Baystation12/Baystation12/pull/16820
* Only ports the StonedMC changes, not the garbage collector (forthcoming in future)
2017-05-30 21:00:37 -04:00
2c8df87899
Tweak to Radiation Optimization
...
* Optimized garbage collection of radiation sources until we get qdel() hints.
* Made the RADIATION_LOWER_LIMIT configurable (option for people to save some cpu time)
* Added some comments and broke the proccessor into separate procs for profiling purposes
* Added a changelog.
2017-05-30 13:55:53 -04:00
6185bbd212
Unified radiation system
2017-05-22 16:24:34 +01:00
4fbfa7ee37
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
...
# Conflicts:
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/mob_defines.dm
# html/changelogs/.all_changelog.yml
# vorestation.dme
2017-05-08 21:07:45 -04:00
347e759b10
Make the multi-z explosion strength scalar configurable.
...
* Its much easier to test out and decide what explosion scalar is nice if you can configure it.
* As an added bonus, by setting it to zero this lets you disable multi-z explosions altogether without turning off all of multi-z.
2017-05-04 20:27:15 -04:00
055c998f82
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/integrated_electronics/subtypes/reagents.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/organs/organ_external.dm
# code/modules/ventcrawl/ventcrawl.dm
# html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
9a7dda1ad1
Implements footstep sound system and adds sounds to various floor types.
...
* Adds system for turfs to have "footstep sounds" that play when someone walks over them.
* Adds system for floor types (the kind of turfs where you can put tiles on them) to support the footstep sounds.
* Adds sounds to plating, tiles, wood, and carpet floor types.
* Footstep sound system is configurable in game_options.txt, it can be turned off completely or the volume adjusted.
2017-04-18 11:33:44 -04:00
66327aecc7
Quick & Dirty Panic Bunker Port
...
Tested on our server, works. Doesn't work if you don't have a DB (how would it?).
2017-04-11 00:13:43 -04:00
b3d652fa50
Quick & Dirty Panic Bunker Port
...
Should work! Should.
2017-04-10 22:38:58 -04:00
387f429e5e
Merge large polaris changes
2017-03-02 22:44:17 -05:00
12abb2d6f2
Ports a large chunk of the map datum system that europa/bay uses.
...
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
41169628da
MORE progress.
2017-02-13 01:20:51 -05:00
3f1e5c80f2
Polaris sync
2017-02-01 15:08:45 -05:00
2eeb4134a8
Ports Bay's Antag Player Age blocker
2017-01-14 17:37:46 -06:00
ee797132db
Allow greater customisation of wiki links ( #461 )
2016-08-14 02:28:31 -04:00
e2f210f5bd
Developers now appear in Staffwho
2016-06-27 18:51:40 -05:00
254a1a04e0
Revert "Adds byond hub visibility as a config option 2"
2016-06-25 01:15:35 +01:00
9a0aef4b83
*Compiles with the correct hub password set in hub.dm by default.
...
*Sets world visibility to 0 to maintain prior behavior.
*Adds a configuration toggle for setting the world public on startup.
2016-06-24 07:39:48 +01:00
0fb98bbabd
Scheduler now uses btime, and other improvements
2016-06-01 17:56:07 +01:00
6c9346d0c4
Prevent Unexpected SQL Errors ( #1628 )
...
* Don't nag me, game.
* Added disabled message, made config consistent
* Missed adding 'else'
2016-05-14 21:09:21 -04:00
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
4aa2e8a269
Added a config option for a visible human deathgasp message.
2016-01-30 08:29:06 +10:30
07d1e6bbaf
Merge pull request #531 from EmperorJon/11_Dec._IRC_related_changes
...
Makes changes to allow IRC bot output
2015-12-11 20:09:06 +00:00
238292a9a6
Makes changes to allow IRC bot output at Sparky's request.
2015-12-11 19:58:05 +00:00
10277880ee
Map and GitHub buttons
2015-12-06 01:47:38 -05:00
7024348ff3
fix rules button
2015-12-06 06:02:48 +00:00
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
63cb207eb8
Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys
...
Languages now use alternative prefix keys.
2015-09-06 17:20:51 +09:30
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
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
a0187f66e3
Fixes Secret.
2015-09-05 14:12:20 +09:30
Reddeyfish