cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Browse Source 
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
This commit is contained in:
Neerti
2015-08-23 01:30:46 -04:00
parent b61b6001a5 222049dd3c
commit 00fa623c9d
792 changed files with 19715 additions and 17049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
interface/skin.dmf
View File

@@ -565,11 +565,11 @@ macro "hotkeymode"
is-disabled = false
elem
name = "4"
command = "a-intent hurt"
command = "a-intent harm"
is-disabled = false
elem
name = "CTRL+4"
command = "a-intent hurt"
command = "a-intent harm"
is-disabled = false
elem
name = "5"
@@ -996,7 +996,7 @@ menu "menu"
is-disabled = false
saved-params = "is-checked"
elem "icon64"
name = "&64x64 (2x)"
name = "&64x64"
command = ".winset \"mapwindow.map.icon-size=64\""
category = "&Icons"
is-checked = false
@@ -1004,6 +1004,15 @@ menu "menu"
group = "size"
is-disabled = false
saved-params = "is-checked"
elem "icon48"
name = "&48x48"
command = ".winset \"mapwindow.map.icon-size=48\""
category = "&Icons"
is-checked = false
can-check = true
group = "size"
is-disabled = false
saved-params = "is-checked"
elem "icon32"
name = "&32x32"
command = ".winset \"mapwindow.map.icon-size=32\""