cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-25 21:16:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync

Browse Source 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
This commit is contained in:
Arokha Sieyes
2016-11-04 15:42:32 -04:00
parent 9c47d2d7e7 2ca61948a5
commit d100c30821
120 changed files with 1138 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/stamps.dm
+2 -2
View File
@@ -53,7 +53,7 @@
icon_state = "stamp-intaff"
/obj/item/weapon/stamp/centcomm
name = "centcomm rubber stamp"
name = "\improper CentCom rubber stamp"
icon_state = "stamp-cent"
/obj/item/weapon/stamp/qm
@@ -65,7 +65,7 @@
icon_state = "stamp-cargo"
/obj/item/weapon/stamp/solgov
name = "solgov stamp"
name = "\improper Sol Government rubber stamp"
icon_state = "stamp-sg"