shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
9acc97dabe5fb805a729d85ea7d5dad820a16b7b
GS13NG/code/game/objects/items
History
Jordan Brown 9acc97dabe Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders 
Fix being able to pull mirage borders, others
2018-06-16 15:50:27 -05:00
..
circuitboards
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
devices
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -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
Merge pull request #38376 from AutomaticFrenzy/patch/lockbox
2018-06-11 22:30:08 -05: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
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
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
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 pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00: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
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
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
extinguisher.dm
…
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
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
granters.dm
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
handcuffs.dm
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
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
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
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
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
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
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
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
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
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
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
weaponry.dm
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00