0844d0b9f0
Merge pull request #1239 from Mark9013100/3/23/2016layering
...
Layering fixes for bedsheets/curtains
2016-03-26 17:06:54 -04:00
b356f5cf21
Construction Update
2016-03-25 16:02:36 -04:00
200057397a
Layering fixes for bedsheets/curtains
2016-03-23 16:19:41 -04:00
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
5846de37be
Fewer decal icon states, shower curtains.
...
Someone had added shower curtains to the map. Creates proper definitions to avoid colors being lost on cleaning.
Floor corner decals now all utilize a white base state and simply apply a color.
2015-08-16 06:09:16 -07:00
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
d1eae14343
Fixes #9183
...
Very critical. No lewdness allowed.
2015-05-11 09:08:27 +02:00
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
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
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
4882074739
Code formatting, EOL at EOF fixes, refactoring
2014-12-18 03:11:49 +01:00
ed28212d22
Adding shower curtains to the various station showers because.. well, it's nice.
2014-08-29 11:08:22 +02:00
2fe167c453
Added curatins.
...
Opaque non-dense structures.
2014-08-27 02:38:36 +04:00
Neerti