Commit Graph

8 Commits

Author SHA1 Message Date
PsiOmega
d14904e1d6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm
2015-05-11 09:28:59 +02:00
PsiOmega
d1eae14343 Fixes #9183
Very critical. No lewdness allowed.
2015-05-11 09:08:27 +02:00
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
f6d0ab1578 Shower curtains no longer lose their default color upon being washed.
NT has now invested in slightly less budget curtains.
2015-04-20 14:42:43 +02:00
Amunak
4882074739 Code formatting, EOL at EOF fixes, refactoring 2014-12-18 03:11:49 +01:00
PsiOmega
ed28212d22 Adding shower curtains to the various station showers because.. well, it's nice. 2014-08-29 11:08:22 +02:00
Chinsky
2fe167c453 Added curatins.
Opaque non-dense structures.
2014-08-27 02:38:36 +04:00