cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 09:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,431 Commits 2 Branches 1 Tag
6309d30a3ae72162acf1e71ff3f15eff767ec7e2
Commit Graph

1104 Commits

Author SHA1 Message Date
Neerti
95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync 
Conflicts:
	polaris.dme
 2015-08-03 22:13:18 -04:00
PsiOmega
f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
 2015-08-01 19:45:42 +02:00
Mloc
f04ca77bfb revert chargen rendering rework 
fixes #9733

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-08-01 11:35:53 +01:00
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
PsiOmegaDelta
f3c9a7224b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/reagents/reagent_containers/borghydro.dm
 2015-07-24 10:53:57 +02:00
Chinsky
390bf93d4d Merge pull request #10261 from PsiOmegaDelta/150722-LawNumbering 
Fixes #10254.
 2015-07-23 21:01:33 +03:00
PsiOmegaDelta
39a1b3e4ab Merge pull request #10272 from Baystation12/dev-freeze 
Dev freeze -> Dev
 2015-07-23 08:14:39 +02:00
Kelenius
b83afb10f8 Moves supply pack check down to atom 2015-07-22 13:05:26 +03:00
Kelenius
b637030c21 Fixes #9209 - cargo manifests don't show contents 
This is a correct way of using initial() with a prototype that doesn't
create a new object
 2015-07-22 10:35:22 +03:00
PsiOmegaDelta
ec3faf35e8 Fixes #10254. 
Nothing to see here.
 2015-07-22 08:11:52 +02:00
GinjaNinja32
0c1aee8074 Fixes <span class='class>, makes Travis check it 2015-07-18 21:13:32 +01: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
Zuhayr
c779482afc Merge with dev. 2015-07-15 16:20:39 +09:30
PsiOmegaDelta
cb1e57eb4e Law spelling corrections, removes some law sets from the law manager overview. 2015-07-14 09:01:13 +02:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
 2015-07-14 08:21:12 +02:00
PsiOmegaDelta
8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-07-14 08:11:11 +02:00
Zuhayr
cd380aba24 Removed the last few references to MODE, fixed some oversights with player_is_antag(). 2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2 Fixes #10129 2015-07-14 05:18:58 +09:30
PsiOmega
b1c26003d0 Further improves the server revision verb. 
Now also includes the current branch name.
 2015-07-13 12:18:09 +02:00
PsiOmegaDelta
746ac180aa Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-08 09:11:47 +02:00
PsiOmegaDelta
16abe8148a Relocates drone law update to the new law set location. 2015-07-08 08:58:38 +02:00
Dragor
2c61ae8e12 Rewording of maintenance drones 
Just slight rewording of a law to make clearer that they shouldn't interact with crew at all.
 2015-07-05 00:07:55 +02:00
PsiOmegaDelta
b5a47fd43b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/power/rust/core_gen.dm
	code/modules/power/rust/fuel_compressor_construction.dm
	code/modules/power/rust/fuel_injector.dm
 2015-07-01 22:46:40 +02:00
Zuhayr
8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
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
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta
e094ca3d26 Span correction. 2015-06-16 10:59:45 +02:00
PsiOmegaDelta
06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-06-16 10:52:33 +02:00
PsiOmega
0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
PsiOmega
ee88e7b8b4 Base Life-addition() 2015-06-13 13:36:08 +02:00
Zuhayr
cef958cac2 Fixes #9503 2015-06-10 23:14:33 +09:30
Neerti
2a45114038 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/datums/supplypacks.dm
	code/game/machinery/bluespacerelay.dm
	code/game/machinery/hologram.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/game/turfs/simulated/walls.dm
	code/global.dm
	code/modules/clothing/spacesuits/rig/suits/ert.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/designs.dm
	config/example/config.txt
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/rig_modules.dmi
	interface/interface.dm
	maps/exodus-3.dmm
	polaris.dme
 2015-06-05 22:11:15 -04:00
GinjaNinja32
314a28fa75 Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm
 2015-06-02 17:33:20 +01:00
PsiOmega
d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
 2015-05-30 16:11:57 +02:00
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
 2015-05-30 15:59:54 +02:00
PsiOmegaDelta
12d1277925 Merge pull request #9577 from Zuhayr/dev-freeze 
Fixes
 2015-05-30 08:35:39 +02:00
Zuhayr
eaf7e6718d Merge pull request #9553 from GinjaNinja32/reagent_protection 
Fixes #5945, de-copy-pastes parapens and sleepypens
 2015-05-30 13:57:31 +09:30
GinjaNinja32
d09cd2fe57 Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/jobs/job_controller.dm
	code/game/verbs/ooc.dm
 2015-05-29 21:55:37 +01:00
GinjaNinja32
58ab763010 code/datums 2015-05-29 20:13:42 +01:00
Zuhayr
a4c2267984 Fixes #9386 2015-05-30 04:01:13 +09:30
Zuhayr
15070d729d Dev-freeze into dev merge. 2015-05-30 00:31:12 +09:30
PsiOmega
4ce737d87d Server build date and revision. 
Can now see the current compilation date and revision:
* In the Dream Daemon log output.
* By using the "Show Server Revision" client verb which also links you to the commit in question.
 2015-05-29 08:26:31 +02:00
GinjaNinja32
86f52910a1 Fixes #5945, de-copy-pastes parapens and sleepypens 
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
 2015-05-28 22:23:37 +01:00
Zuhayr
d6e3df5fba Attempting to guarantee immunity to viruses for virus_immune var. 2015-05-25 15:52:51 +09:30
Atlantis
97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Chinsky
33e8791fe9 Merge pull request #9264 from Hubblenaut/airlocks 
Fixes airlock wires
 2015-05-18 18:21:05 +03:00
Hubblenaut
86426d0424 Fixes airlock wires and adds backup power light 2015-05-18 16:55:12 +02:00
Chinsky
a3a2c615de Merge pull request #9300 from PsiOmegaDelta/RoundStart 
Gamestart cleanup.
 2015-05-18 12:00:49 +03:00