cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-24 13:46:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,022 Commits 7 Branches 1 Tag
dependabot/github_actions/yogstation13/DreamAnnotate-3
Commit Graph
1039 Commits
Author SHA1 Message Date
mwerezak b361f9ad12 Fixes #10723 2015-08-18 10:28:06 -04:00
mwerezak 7c8c42137e Fixes #10680 2015-08-18 02:54:13 -04:00
PsiOmegaDelta 5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/machinery/Sleeper.dm
 2015-08-17 13:05:58 +02:00
PsiOmegaDelta 55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/setup.dm
 2015-08-17 09:37:49 +02:00
PsiOmegaDelta 1dcdb423c7 Merge pull request #10685 from mwerezak/skipjack 
Fixes
 2015-08-17 06:56:50 +02:00
mwerezak 524548cc95 Fixes #10680 2015-08-16 14:58:27 -04:00
PsiOmega 21fd8d825d Makes the private AI channel truly private. 2015-08-16 15:43:28 +02:00
Zuhayr 7e8713039a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-16 05:40:47 -07:00
mwerezak 4b21f5f8ad Fixes pipes disappearing when wrenching fails 2015-08-15 15:46:52 -04:00
PsiOmegaDelta 77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
 2015-08-13 08:09:28 +02:00
Kelenius 60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
 2015-08-11 18:47:05 +01:00
PsiOmegaDelta 54162f1c7d Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes 2015-08-11 12:20:54 +02:00
PsiOmega 3d03842f8a Adds missing closing quote. 2015-08-10 18:10:53 +02:00
PsiOmega 570806046b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/custom_sprites.dm
	code/modules/organs/organ_stump.dm
	code/setup.dm
 2015-08-10 17:56:14 +02:00
PsiOmega fb6ab23189 Makes the new initialization message use the proper method. 2015-08-10 17:46:38 +02:00
PsiOmega a710e77d46 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/controllers/master_controller.dm
	code/game/area/areas.dm
 2015-08-10 17:42:40 +02:00
mwerezak 12549b7e93 Fixes area power initialization 
Power channels start on when objects initialize, then are turned off and area machines notified in area initialization if an apc is not found.
 2015-08-09 19:58:37 -04: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 d911badae8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge 
Conflicts:
	.travis.yml
	polaris.dme
 2015-08-07 20:25:57 -04:00
Kelenius 25eaeecb24 Optimizes reference finder 2015-08-07 09:28:29 +03:00
Kelenius 16ca8ca768 Optimizes garbage reference searcher 2015-08-06 10:48:14 +03:00
Kelenius cc83f35d72 Searches for references to hard-deleted objects 2015-08-05 18:10:41 +03: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
PsiOmegaDelta 0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +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 94a2ec5bf1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2 
Conflicts:
	.travis.yml
	polaris.dme
 2015-07-26 16:01:27 -04:00
PsiOmega 2d24960603 Fixes #9894 some more. 
Ensures the vote sanity check is done first, before any change of vote counts.
 2015-07-26 10:45:05 +02:00
PsiOmegaDelta 617db485ee qdel/Destroy entries. 2015-07-21 14:22:01 +02:00
PsiOmega 34b0517578 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/topic.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/nano/modules/atmos_control.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
 2015-07-17 23:19:34 +02:00
PsiOmega b4d15ceb6e Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/inventory.dm
 2015-07-17 23:09:24 +02:00
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
PsiOmega 4aa11441cc Fixes #10212. 
NSV Icarus is now NDV Icarus.
 2015-07-16 20:32:56 +02:00
Woodrat 62ddc29194 Fixed transfer and Escape Shuttle. 
- Added more lights and cameras
- Fixed the outposts
- Started work on medical
 2015-07-13 16:26:29 -07: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
PsiOmegaDelta 9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
 2015-07-11 10:58:49 +02:00
Null Snapshot 168f823c35 Fixed up the things pointed out by Ccomp5950. 2015-07-09 22:19:05 -07:00
Null Snapshot a28d3cd9d1 Added new config variables for toggling moderator tempban permissions and maximum duration for bans. 2015-07-09 12:10:18 -07:00
GinjaNinja32 f3d09e092e Removes the approximations cheap_pythag and cheap_hypotenuse, since they're anything *but* cheap 2015-07-09 16:25:47 +01:00
Kelenius 879fc98a8c Fixes #9894 2015-07-09 11:50:42 +03:00
Woodrat c5b30257f7 Neerti is Satan, updates map. Updates files. 2015-07-07 20:31:00 -07:00
PsiOmegaDelta 5703fdfe85 Re-implements admin fun events as datums. 2015-07-07 11:19:01 +02:00
SledgeLP 6be647c9e4 Fixing namings for Shuttle targets 
Changing of the offsite location names for the mining and research outpost docks to match the outpost Z level names.
 2015-07-06 23:33:06 -05:00
mwerezak 087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-06-28 22:35:14 -04:00
PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
 2015-06-26 20:28:47 +02:00
Neerti 462eaa834b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync 
Conflicts:
	.travis.yml
	code/modules/clothing/spacesuits/rig/modules/combat.dm
	code/modules/clothing/spacesuits/rig/modules/utility.dm
	code/modules/mob/living/silicon/ai/ai.dm
	icons/mob/rig_back.dmi
	polaris.dme
 2015-06-25 18:50:18 -04:00
Chinsky 5dda5021a3 Fixed a list being qdel'd when radio is deleted. 2015-06-25 23:04:04 +03:00