Leshana
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
Yoshax and GitHub
411e442fdd
Increases the radiation protection modifiers
2017-06-10 00:23:52 +01:00
Anewbe and GitHub
b9007d11a8
Merge pull request #3493 from VOREStation/just-stonedmc
...
Port of StonedMC master controller framework
2017-06-04 16:15:13 -05:00
Leshana
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
Leshana
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
Leshana
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
Ben Reeve and Yoshax
6185bbd212
Unified radiation system
2017-05-22 16:24:34 +01:00
Leshana
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
Leshana
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
Arokha Sieyes
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
Leshana
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
Arokha Sieyes
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
Arokha Sieyes
b3d652fa50
Quick & Dirty Panic Bunker Port
...
Should work! Should.
2017-04-10 22:38:58 -04:00
Arokha Sieyes
387f429e5e
Merge large polaris changes
2017-03-02 22:44:17 -05:00
Neerti
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
Arokha Sieyes
41169628da
MORE progress.
2017-02-13 01:20:51 -05:00
killer653
3f1e5c80f2
Polaris sync
2017-02-01 15:08:45 -05:00
Anewbe
2eeb4134a8
Ports Bay's Antag Player Age blocker
2017-01-14 17:37:46 -06:00
Eearslya Sleiarion and Spades
ee797132db
Allow greater customisation of wiki links ( #461 )
2016-08-14 02:28:31 -04:00
Anewbe
e2f210f5bd
Developers now appear in Staffwho
2016-06-27 18:51:40 -05:00
EmperorJon and GitHub
254a1a04e0
Revert "Adds byond hub visibility as a config option 2"
2016-06-25 01:15:35 +01:00
spookerton
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
Yoshax
0fb98bbabd
Scheduler now uses btime, and other improvements
2016-06-01 17:56:07 +01:00
Arokha Sieyes and Datraen
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
Yoshax
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
Zuhayr
4aa2e8a269
Added a config option for a visible human deathgasp message.
2016-01-30 08:29:06 +10:30
EmperorJon
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
Jon
238292a9a6
Makes changes to allow IRC bot output at Sparky's request.
2015-12-11 19:58:05 +00:00
SinTwo
10277880ee
Map and GitHub buttons
2015-12-06 01:47:38 -05:00
GinjaNinja32
7024348ff3
fix rules button
2015-12-06 06:02:48 +00:00
Neerti
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
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
Neerti
7fab70767d
colony-1 could not be saved, unfortunately. RIP
2015-08-23 18:04:47 -04:00
Neerti
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
Kelenius
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
Neerti
88270df755
Refactors the map generation to not assume the fifth z-level is mining. Now it checks the config.txt.
2015-08-09 05:49:25 -04:00
Neerti
8152ce0676
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync
...
Conflicts:
polaris.dme
2015-07-29 03:45:53 -04: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
Zuhayr
4afa8a80f8
Readds config option to disable organ decay.
2015-07-27 15:30:38 +09:30
Neerti
6eece8ac45
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2
...
Conflicts:
.travis.yml
polaris.dme
2015-07-16 22:46:53 -04:00
PsiOmegaDelta
c6f4f7fcee
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-12 15:14:43 +02:00
PsiOmegaDelta
7b3759c1f3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/configuration.dm
code/modules/admin/topic.dm
config/example/config.txt
2015-07-12 14:49:31 +02:00
Null Snapshot
168f823c35
Fixed up the things pointed out by Ccomp5950.
2015-07-09 22:19:05 -07:00
Leshana