Nuke starting condition rebalance, op number scaling rebalance.
Typo.
Merge pull request #4139 from Zuhayr/master

Nuke starting condition rebalance, op number scaling rebalance.
Custom Item fixes:  Mai's dress.

Uniform removed in merge probably, but I messed up the righthand icon
and had the lefthand icon in there.  derp.
Merge pull request #4144 from Ccomp5950/mai_fix

Custom Item fixes:  Mai's dress.
Gib rewrite/resprite to allow for arbitrary blood and flesh colours.
Merge pull request #4146 from Baystation12/dev-freeze

Dev-freeze --> Master staging [Going live!]
Fixed the centcomm stamp not showing up on paper

* The iconstate was named incorrectly
Merge pull request #4156 from Kilakk/master

Fixed the centcomm stamp not showing up on paper
Binary merge conflict, agh. Manual merge incoming.
Manual icon merge.
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Merge pull request #4158 from Zuhayr/dev

Dev
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	code/game/gamemodes/nuclear/nuclear.dm