Merge remote-tracking branch 'origin/master' into TGUI-4

2020-07-30 14:43:52 +08:00
parent 894ea242b4 0711e45d18
commit b376a6b6c4
662 changed files with 13844 additions and 6845 deletions
@@ -273,6 +273,7 @@
 		var/datum/ui_state/default/paper_state/state = new
 		state.edit_mode = MODE_STAMPING	// we are read only becausse the sheet is full
 		state.stamp_icon_state = P.icon_state
+		state.stamp_name = P.name

 		var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/simple/paper)
 		state.stamp_class = sheet.icon_class_name(P.icon_state)