shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
cfe5c7a96256ae00a0704b670d2f11cc84159c19
GS13NG/code/game/objects/items
History
LetterJay cfe5c7a962 Merge pull request #6895 from Citadel-Station-13/upstream-merge-38023 
[MIRROR] Fix various bugs with telekinesis
2018-05-25 23:28:01 -05:00
..
circuitboards
[READY] Gives Stacking Machines and their consoles machine boards (#37607)
2018-05-19 16:39:45 -05:00
devices
Disallow effects from being scanned by the chameleon projector (#38017)
2018-05-25 07:38:01 -05:00
grenades
Merge branch 'master' into upstream-merge-37597
2018-05-22 07:21:53 -05:00
implants
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
melee
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
robot
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
stacks
Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay
2018-05-25 10:49:21 -05:00
storage
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
2018-05-23 07:46:26 -05:00
tanks
Merge branch 'master' into upstream-merge-37486
2018-05-21 11:59:57 -05:00
tools
Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay
2018-05-25 10:49:21 -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-37582
2018-05-22 07:22:42 -05: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
…
bodybag.dm
Kills off three more flags from flags_2
2018-04-29 17:30:55 -05:00
candle.dm
…
cardboard_cutouts.dm
…
cards_ids.dm
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -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-37582
2018-05-22 07:22:42 -05:00
clown_items.dm
Merge branch 'master' into upstream-merge-37582
2018-05-21 08:35:21 -05:00
control_wand.dm
NTNet improvements!
2018-04-27 20:24:28 -05:00
cosmetics.dm
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -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
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
dehy_carp.dm
…
dice.dm
…
dna_injector.dm
…
documents.dm
…
eightball.dm
…
extinguisher.dm
…
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
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
hot_potato.dm
…
inducer.dm
Merge pull request #37364 from Jalleo/Inducer_change
2018-04-23 08:47:55 -05:00
kitchen.dm
…
latexballoon.dm
…
manuals.dm
…
miscellaneous.dm
…
mop.dm
…
paint.dm
…
paiwire.dm
…
pet_carrier.dm
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
pinpointer.dm
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
plushes.dm
…
pneumaticCannon.dm
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
powerfist.dm
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
RCD.dm
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
RCL.dm
…
religion.dm
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
RPD.dm
Fix flipping of trinary pipe fittings and related RPD tooltips (#37982)
2018-05-23 06:33:07 -05:00
RSF.dm
…
scrolls.dm
…
sharpener.dm
…
shields.dm
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
shooting_range.dm
…
signs.dm
…
singularityhammer.dm
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
stunbaton.dm
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05: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
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
theft_tools.dm
…
toys.dm
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
trash.dm
…
twohanded.dm
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
vending_items.dm
…
weaponry.dm
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00