shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
adf1505c706392eb9380b2b20b55df422e8cd393
GS13NG/code/game/objects/items
History
LetterJay adf1505c70 Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486 
[MIRROR] Moves several clothing-specific flags from /atom to their proper type
2018-05-22 07:18:34 -05:00
..
circuitboards
[READY] Gives Stacking Machines and their consoles machine boards (#37607)
2018-05-19 16:39:45 -05:00
devices
Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476
2018-05-21 11:23:02 -05:00
grenades
Merge pull request #37956 from ShizCalev/chem-grenade-cleanup
2018-05-21 16:35:54 -05:00
implants
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
melee
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
robot
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
stacks
Merge pull request #37846 from DaxDupont/axe-time
2018-05-16 04:46:59 -05:00
storage
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
tanks
Merge branch 'master' into upstream-merge-37486
2018-05-21 11:59:57 -05:00
tools
modular_citadel
2018-05-20 23:04:13 -05:00
AI_modules.dm
Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER
2018-05-01 15:40:09 -05:00
airlock_painter.dm
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
apc_frame.dm
Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-11 17:30:32 -05:00
blueprints.dm
game folder
2018-04-23 00:17:28 -05:00
body_egg.dm
[MIRROR] Replaced body zone magic strings with defines (#6004)
2018-03-19 21:18:57 -05:00
bodybag.dm
…
candle.dm
…
cardboard_cutouts.dm
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
cards_ids.dm
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
charter.dm
…
chrono_eraser.dm
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
cigs_lighters.dm
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
clown_items.dm
Merge pull request #37816 from YPOQ/bikehornfix
2018-05-13 12:12:17 -05:00
control_wand.dm
NTNet improvements!
2018-04-27 20:24:28 -05:00
cosmetics.dm
[MIRROR] Replaced body zone magic strings with defines (#6004)
2018-03-19 21:18:57 -05:00
courtroom.dm
…
crayons.dm
Crayons no longer use charge when used on a canvas
2018-05-04 22:27:00 -05:00
defib.dm
Fixes defibillator runtime
2018-05-21 14:54:46 -05:00
dehy_carp.dm
…
dice.dm
d (#36046)
2018-03-03 00:31:35 -06:00
dna_injector.dm
[MIRROR] Converts several species traits into generic traits (#5710)
2018-03-05 12:34:01 -06:00
documents.dm
…
eightball.dm
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
extinguisher.dm
[READY] Refactors wet floors to a component (#36130)
2018-03-17 07:53:11 -05:00
flamethrower.dm
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
gift.dm
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
granters.dm
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
handcuffs.dm
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
his_grace.dm
…
holosign_creator.dm
…
holy_weapons.dm
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
hot_potato.dm
Fixes hot potato coloration (#36655)
2018-03-28 12:17:45 -05:00
inducer.dm
Merge pull request #37364 from Jalleo/Inducer_change
2018-04-23 08:47:55 -05:00
kitchen.dm
[MIRROR] Replaced body zone magic strings with defines (#6004)
2018-03-19 21:18:57 -05:00
latexballoon.dm
…
manuals.dm
Refactors Spell and Martial Art Books to use Action Granters!
2018-03-28 12:18:06 -05:00
miscellaneous.dm
…
mop.dm
…
paint.dm
…
paiwire.dm
…
pet_carrier.dm
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
pinpointer.dm
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
plushes.dm
[MIRROR] A Nar-Sie Plushie can be used an an extra invoker now! (#5723)
2018-02-27 05:03:07 -06:00
pneumaticCannon.dm
Quote the armor lists
2018-02-16 00:26:26 -06:00
powerfist.dm
Quote the armor lists
2018-02-16 00:26:26 -06:00
RCD.dm
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
RCL.dm
Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679)
2018-02-16 00:41:04 -06:00
religion.dm
Moves several clothing-specific flags from /atom to their proper type
2018-04-28 13:21:48 -05:00
RPD.dm
Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-09 22:44:57 -05:00
RSF.dm
[MIRROR] Renames various reagent IDs to be more descriptive (#5634)
2018-02-24 09:35:48 -06:00
scrolls.dm
…
sharpener.dm
…
shields.dm
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
shooting_range.dm
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
signs.dm
…
singularityhammer.dm
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
stunbaton.dm
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
taster.dm
…
teleportation.dm
[READY] Properly Adds a suicide action to the hand tele
2018-05-08 20:08:03 -05:00
teleprod.dm
…
theft_tools.dm
…
toys.dm
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
trash.dm
…
twohanded.dm
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
vending_items.dm
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
weaponry.dm
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00