cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

Browse Source 
Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
This commit is contained in:
Miniature
2011-12-03 19:28:10 +10:30
parent e1a254c34f ac581158ca
commit f62eccc76b
179 changed files with 8711 additions and 8146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interface/skin.dmf
+8 -8
View File
@@ -4,20 +4,20 @@ macro "macro"
command = ".center"
is-disabled = false
elem
name = "NORTHEAST"
command = "swap-hand"
name = "NORTHEAST+REP"
command = ".northeast"
is-disabled = false
elem
name = "SOUTHEAST"
command = "attack-self"
name = "SOUTHEAST+REP"
command = ".southeast"
is-disabled = false
elem
name = "SOUTHWEST"
command = "toggle-throw-mode"
name = "SOUTHWEST+REP"
command = ".southwest"
is-disabled = false
elem
name = "NORTHWEST"
command = "drop-item"
name = "NORTHWEST+REP"
command = ".northwest"
is-disabled = false
elem
name = "SHIFT+WEST"