coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
903c0412791107a0020fb2c22fc1d4d75faa598c
kiwistation/code/game/objects/items/weapons
T
History
xxalpha 4d4b8e64c1 Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-16 23:14:14 +01:00
..
grenades
Copy of Anonus' Blob tweak PR, with less commits.
2015-09-15 16:03:55 +02:00
implants
removes a bunch of .0
2015-09-10 20:57:30 +09:00
melee
Merge pull request #11700 from feemjmeem/suicides-sep10
2015-09-16 23:57:51 +02:00
storage
Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r
2015-09-16 23:14:14 +01:00
tanks
Merge pull request #11700 from feemjmeem/suicides-sep10
2015-09-16 23:57:51 +02:00
AI_modules.dm
Merge remote-tracking branch 'tgstation/master' into point-zero
2015-09-12 21:07:40 +09:00
airlock_painter.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
cards_ids.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
chrono_eraser.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
cigs_lighters.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
clown_items.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
cosmetics.dm
Fixes runtime with do_after()'s that don't use a target.
2015-06-25 19:05:23 +02:00
courtroom.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
defib.dm
Fixes monkeyize/humanize removing the mob's viruses when they should be kept.
2015-09-13 22:52:38 +02:00
dice.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
2015-07-19 21:53:39 +02:00
dna_injector.dm
Merge pull request #11769 from phil235/FixMutations
2015-09-15 22:31:59 +03:00
explosives.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
extinguisher.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
flamethrower.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
gift_wrappaper.dm
Made some changes and repathing for posters.
2015-09-04 18:30:58 -04:00
handcuffs.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
janisigns.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
kitchen.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
manuals.dm
Readding loading chef food into snack vending mechines.
2015-07-23 16:06:03 +02:00
mop.dm
Merge pull request #11685 from bgobandit/fuckingprogressbarsfuck
2015-09-13 17:30:50 +02:00
paint.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
paiwire.dm
Fixes proc arguments
2015-07-15 23:52:35 +02:00
pneumaticCannon.dm
Fixes proc arguments
2015-07-15 23:52:35 +02:00
RCD.dm
Merge remote-tracking branch 'tgstation/master' into point-zero
2015-09-12 21:07:40 +09:00
RPD.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
RSF.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
scrolls.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
shields.dm
Fixes proc arguments
2015-07-15 23:52:35 +02:00
signs.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
singularityhammer.dm
makes all Destroy()'s return properly
2015-08-31 00:21:01 -06:00
stunbaton.dm
Fixes proc arguments
2015-07-15 23:52:35 +02:00
teleportation.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
tools.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
twohanded.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
vending_items.dm
removes a bunch of .0
2015-09-10 20:57:30 +09:00
weaponry.dm
Merge remote-tracking branch 'upstream/master' into Impropermaterials
2015-09-13 08:58:40 -04:00