e045382022
Neater order.
2016-02-25 18:53:58 +01:00
5edc60ed0a
Unifies corpse spawners
2016-02-25 18:36:16 +01:00
309bfa0e91
Merge pull request #15418 from MMMiracles/spaceman
...
Adds several templates for space ruins
2016-02-18 01:30:13 -06:00
f3fd49349c
Prisoner Transport
2016-02-17 06:32:32 -06:00
e10fe56f6c
adds 11 templates for space ruins
2016-02-10 21:32:40 -05:00
2be090aee1
Merge branch 'master' of https://github.com/tgstation/-tg-station into geneticsishard
2016-01-01 15:03:45 -05:00
9c8a0cb0a5
Implant
2015-12-31 10:47:33 -06:00
1c1e892ddf
New Away Mission: Research Facility
2015-12-22 17:34:04 -05:00
5201b77495
Random Ruins
2015-12-19 06:55:50 -06:00
134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
cde4df61ae
conFLICTS
2015-12-16 06:26:54 -05:00
401a947a08
fixes plasmaman corpse spawner, adds a comment about it using the typepath.
2015-12-12 23:54:00 -05:00
bf902bbe7c
question answered, then.
2015-12-12 19:15:49 -05:00
a2d0086762
consistency is a virtue
2015-12-12 19:09:47 -05:00
b3d992a832
conflict fix
2015-12-11 16:21:18 -05:00
4db8386ebb
Fixes pre-round sleeper activation
2015-12-07 19:36:28 +01:00
81f6c450e5
fianl stuff for now, testing!!!!!
2015-12-06 14:32:10 -05:00
611fb49c1c
Wake me up inside
2015-11-29 00:58:30 -05:00
ce9ea0ca46
FUCK THIS FUCK EVERYTHING
2015-11-26 22:22:07 -05:00
671fa02edf
almost there folks
2015-11-23 21:53:27 -05:00
4a363b4363
Merge pull request #12910 from KorPhaeron/ghost_spawner
...
Ghost spawner naming fix
2015-11-23 20:02:53 -06:00
888fe9fb30
Default
2015-11-21 06:43:01 -06:00
ef6af4ef5b
Unfucking shit ass plasma memes part 1
2015-11-13 21:28:00 -05:00
90c55718af
conflict fix oh vey
2015-11-13 16:27:03 -05:00
d0356f2741
more map changes, misc edits
2015-11-13 16:16:57 -05:00
a6eaf76d72
Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug.
2015-11-12 21:54:08 -05:00
01742de97f
another update, added some corpse spawners for map use.
2015-11-11 18:51:56 -05:00
f8aba56a96
Better comment
2015-11-07 16:55:09 -06:00
4ef3a9332a
Mob name fix
2015-11-07 16:51:31 -06:00
6a8919197b
Flavour
2015-11-03 23:37:05 -06:00
c87c06411f
Ghost spawner
2015-11-03 23:25:36 -06:00
202eefe635
Fixes the compile issue, adds myself to admin.txt
2015-10-25 14:45:18 -04:00
6af623a215
Update
2015-10-09 23:13:24 -05:00
77b2e54de7
code improvement and overlays for fancy storage, dropper, syringe and lighter
2015-06-10 18:58:19 +10:00
55b81363cc
Merge remote-tracking branch 'upstream/master' into hardjet
...
Conflicts:
code/modules/clothing/spacesuits/hardsuit.dm
2015-03-27 19:35:10 +00:00
edccabb0c4
Only engineering type hardsuits have the inbuilt jetpack.
2015-03-18 17:48:45 +00:00
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
a9c181bbcc
Repath all non jetpack tank types to tank/internals
...
Repath all portable tanks to tank/internals, except jetpacks
Update ministation
2015-02-01 18:25:39 +00:00
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
2607a456c0
Merge pull request #6634 from paprka/chefuniform
...
Makes the second cook spawn in short order cook clothes, fixes chef uniform
2014-12-30 03:45:13 -03:00
e8738e8dd5
Changes some clothing and chef gear
2014-12-28 02:13:28 -08:00
cc474b2af6
Merge pull request #6591 from phil235/FingerlessSpriteFix
...
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03:00
5c8a8b5dca
Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
2014-12-26 09:09:24 -08:00
b6e35278e3
Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
...
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
2371e2ebd8
renames chef to cook
2014-12-22 17:02:06 -08:00
db6eabfc4e
intial commit for syndicate hardsuit feature
2014-12-13 22:26:09 -08:00
3240cbea99
Tactical armor, etc
2014-12-12 00:23:16 -08:00
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
ec6b2424d2
purge the unused
2014-11-13 21:10:53 -08:00
d80be7f689
changes robotics gloves to fingerless gloves
2014-10-08 05:11:30 -07:00
AnturK
Cheridan
KorPhaeron
MMMiracles
oranges
as334
duncathan salt
KorPhaeron
Jordie0608
xxalpha
phil235
paprka
tkdrg
phil235