coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
0876b424a7e32a9efa5f6bafff2967b925f34d7b
kiwistation/code/game/objects/items
T
History
phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing 
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
..
devices
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-31 19:59:00 +01:00
robot
Replaces yet more istypes with helpers (#20806)
2016-10-10 17:48:35 +13:00
stacks
Fixed a few bugs with clockwork proselytizers (#21221)
2016-10-29 11:34:03 +13:00
weapons
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-31 19:59:00 +01:00
apc_frame.dm
Adds a few turf istype helpers (#20754)
2016-10-01 19:25:46 +02:00
blueprints.dm
Fixes hardsuit not having 300hp (I gave it to the helmet, but had forgotten about the suit itself)
2016-10-17 22:51:57 +02:00
body_egg.dm
Merge pull request #18729 from coiax/remove-spawn-3
2016-06-21 20:11:08 +12:00
bodybag.dm
Clicking a floor with a bodybag or roller bed now deploys them directly.
2016-10-14 17:47:16 +02:00
candle.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
cardboard_cutouts.dm
Adding var/list/atom_colours to /atom .
2016-10-19 01:51:30 +02:00
charter.dm
Adds a Reply link to station charter
2016-10-26 01:01:57 -04:00
control_wand.dm
properly
2016-06-13 09:43:01 -04:00
crayons.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
dehy_carp.dm
Space carp ensure they still exist after animation sleep (#20710)
2016-09-28 11:01:43 -05:00
documents.dm
Fixes hardsuit not having 300hp (I gave it to the helmet, but had forgotten about the suit itself)
2016-10-17 22:51:57 +02:00
latexballoon.dm
Replaces a bunch of istypes with their proper macros (#20739)
2016-09-30 20:21:08 +02:00
nuke_tools.dm
Fixes hardsuit not having 300hp (I gave it to the helmet, but had forgotten about the suit itself)
2016-10-17 22:51:57 +02:00
religion.dm
Adding var/list/atom_colours to /atom .
2016-10-19 01:51:30 +02:00
shooting_range.dm
Added priority overlay system. (#18225)
2016-06-17 10:11:53 +12:00
toys.dm
I forgot a period
2016-10-26 15:35:09 -07:00
trash.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00