shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
ce9d797ac554ddb90709c988c9ec904c0acd0b91
GS13NG/code/game/objects/items
T
History
LetterJay ce9d797ac5 Merge pull request #7190 from Citadel-Station-13/upstream-merge-38577 
[MIRROR] PDA can be ctrl-clicked to remove the item in its pen slot
2018-06-24 15:07:54 -05:00
..
circuitboards
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
devices
PDA can be ctrl-clicked to remove the item in its pen slot (#38577)
2018-06-19 09:49:36 -05:00
grenades
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
implants
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
melee
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
robot
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
stacks
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
storage
adds missing /'s at the starts of some obj instances (#7169)
2018-06-18 11:53:33 -07:00
tanks
Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders
2018-06-16 15:50:27 -05:00
tools
[MIRROR] [s]Add pacifism checks for screwdriver/bottle attacks (#7092)
2018-06-15 02:42:34 -07:00
AI_modules.dm
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -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
…
body_egg.dm
…
bodybag.dm
…
candle.dm
…
cardboard_cutouts.dm
…
cards_ids.dm
[READY] Helps data disks stop being unemployed (#38319)
2018-06-19 09:23:33 -05:00
charter.dm
…
chrono_eraser.dm
…
cigs_lighters.dm
Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533)
2018-06-18 09:37:48 -05:00
clown_items.dm
Merge branch 'master' into upstream-merge-37582
2018-05-21 08:35:21 -05:00
control_wand.dm
…
cosmetics.dm
…
courtroom.dm
…
crayons.dm
…
defib.dm
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
dehy_carp.dm
…
dice.dm
…
dna_injector.dm
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
documents.dm
…
eightball.dm
…
extinguisher.dm
Advanced foam extinguisers (#38270)
2018-06-18 09:38:07 -05:00
flamethrower.dm
Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631)
2018-05-22 22:11:23 -05:00
gift.dm
…
granters.dm
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
handcuffs.dm
…
his_grace.dm
…
holosign_creator.dm
…
holy_weapons.dm
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
hot_potato.dm
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
inducer.dm
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
kitchen.dm
…
latexballoon.dm
…
manuals.dm
…
miscellaneous.dm
…
mop.dm
…
paint.dm
…
paiwire.dm
…
pet_carrier.dm
…
pinpointer.dm
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
plushes.dm
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
pneumaticCannon.dm
…
powerfist.dm
…
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
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07: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
…
stunbaton.dm
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
taster.dm
…
teleportation.dm
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
teleprod.dm
…
theft_tools.dm
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
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
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00