coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
4c3f83d085ccae384a33db2498de970cf0918df5
kiwistation/code/game/objects/items/weapons
T
History
Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
2014-12-28 11:20:15 +03:00
..
grenades
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-28 11:20:15 +03:00
implants
Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
2014-12-04 12:45:31 -06:00
melee
Fixed conflicts
2014-12-23 05:39:39 +03:00
storage
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-28 11:20:15 +03:00
tanks
added message for toggling jetpack on and off
2014-12-24 16:10:44 -08:00
AI_modules.dm
Fixes the new AI lawcap config option
2014-12-02 18:27:06 -03:00
airlock_painter.dm
Hopefully final pass of object -> mob examine switch
2014-08-20 07:07:30 -07:00
cards_ids.dm
makes APC call parent
2014-12-09 18:53:29 -08:00
cigs_lighters.dm
Little fix.
2014-12-18 18:00:17 +01:00
clown_items.dm
Fixes the mouth washing message and the cleaning message appearing at the same time.
2014-11-12 17:37:27 +01:00
cosmetics.dm
Fix being able to apply lipstick through masks and items covering the mouth.
2014-11-01 13:28:32 +01:00
defib.dm
Fixes a lot of "the the" in messages.
2014-12-16 22:59:55 +01:00
dice.dm
Makes dice use overlays
2014-11-24 08:01:32 +11:00
dna_injector.dm
Fixed stuff tkdrg pointed out
2014-12-28 10:49:04 +03:00
explosives.dm
Fix of c4 not deleting on signaler explosions
2014-12-16 00:47:09 +03:00
extinguisher.dm
Conflicts:
2014-11-13 17:33:32 +01:00
flamethrower.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
2014-03-21 03:05:39 -07:00
gift_wrappaper.dm
Adds a santa event where a dead player is spawned as Santa! HO HO HO!
2014-12-08 17:03:52 +01:00
handcuffs.dm
Made clumsiness into disability
2014-12-14 08:04:48 +03:00
janisigns.dm
oops
2014-10-08 13:52:21 -07:00
kitchen.dm
Fixed stuff tkdrg pointed out
2014-12-28 10:49:04 +03:00
manuals.dm
Spacemen can now skim.
2014-10-05 09:51:08 -03:00
mop.dm
Conflicts:
2014-11-13 17:33:32 +01:00
paint.dm
Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.
2014-01-15 21:30:55 +00:00
paiwire.dm
pAIs added. Two on station (Crew Quarters, R&D Director's Office) and one on the Derelict.
2011-05-30 19:33:28 +00:00
power_cells.dm
Finished the exofab revamp:
2014-12-02 23:00:22 +01:00
RCD.dm
Adds changelog and nerfs door deconstruction.
2014-12-07 11:46:59 +00:00
RPD.dm
RPD tweaks
2014-12-26 20:50:34 -03:00
RSF.dm
First pass at a qdel() garbage collection system for tgstation
2014-02-23 14:55:12 -08:00
scrolls.dm
Fixes wizard slipping on all the area soaps
2014-11-22 19:24:57 -03:00
shields.dm
Conflict fix
2014-12-21 06:12:33 +03:00
singularityhammer.dm
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02:00
stunbaton.dm
Conflict fix
2014-12-21 06:12:33 +03:00
table_rack_parts.dm
Conflicts:
2014-11-13 17:33:32 +01:00
teleportation.dm
Prevent using the hand teleporter from inside closets and when under the influence of a chameleon projector.
2014-12-15 00:08:03 +01:00
tools.dm
Conflict fix
2014-12-21 06:12:33 +03:00
twohanded.dm
Fixed stuff tkdrg pointed out
2014-12-28 10:49:04 +03:00
vending_items.dm
Merge remote-tracking branch 'upstream/master' into meido
2014-12-22 16:19:43 -03:00
weaponry.dm
Fixes up some silly problems with cursed items:
2014-09-15 19:22:25 -04:00