Hotfixes for March 3, 2017 (#260)

* fixes sterile mask box

* fixes admin map templates

https://github.com/tgstation/tgstation/pull/24581

* syndicate beacon refactor

https://github.com/tgstation/tgstation/pull/24612

* singularity tracking

https://github.com/tgstation/tgstation/pull/24609

* puddle description

https://github.com/tgstation/tgstation/pull/24601

* aux base landing fix

https://github.com/tgstation/tgstation/pull/24594

* comms console cooldown

https://github.com/tgstation/tgstation/pull/24579

* cult fixes + pronouns

https://github.com/tgstation/tgstation/pull/24590

* minebots now check for pressure

https://github.com/tgstation/tgstation/pull/24604

* fixes a very annoying spawn

https://github.com/tgstation/tgstation/pull/24588

* fixes false positive AI cheat check

https://github.com/tgstation/tgstation/pull/24558
mso is bae

* Fixes abductor surgery designs

https://github.com/tgstation/tgstation/pull/24593

* Allows transit space shuttle repairs

https://github.com/tgstation/tgstation/pull/24582

* fixes indentation error

This commit is contained in:

TalkingCactus

2017-03-03 15:15:42 -05:00

committed by

GitHub

parent 8abcb9859b

commit 97327d2beb

18 changed files with 79 additions and 59 deletions

code/game/objects/items/stacks/stack.dm

+1 -4

View File

@@ -156,10 +156,7 @@
 		//BubbleWrap END
 	if (src && usr.machine==src) //do not reopen closed window
 		spawn( 0 )
 			src.interact(usr)
 			return
 	return
 		addtimer(CALLBACK(src, /atom/.proc/interact, usr), 0)
 /obj/item/stack/proc/building_checks(datum/stack_recipe/R, multiplier)
 	if (src.get_amount() < R.req_amount*multiplier)