shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
2b99f729e671b741b447100b5298c9056297f9fb
GS13NG/code/game/objects/items
History
kevinz000 2b99f729e6 Merge pull request #11384 from Citadel-Station-13/Ghommie-patch-3 
I forgot to delete a line on the (now working) PDA overlays fix.
2020-03-08 11:09:17 -07:00
..
circuitboards
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
devices
Merge pull request #11384 from Citadel-Station-13/Ghommie-patch-3
2020-03-08 11:09:17 -07:00
grenades
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
implants
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
melee
Merge branch 'master' into gc_debugging
2020-03-06 10:14:19 -07:00
robot
changes
2020-03-03 20:54:53 -07:00
stacks
Merge pull request #11222 from Trilbyspaceclone/ashwalkers
2020-03-06 13:48:03 +01:00
storage
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-06 11:58:11 +01:00
tanks
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-05 04:34:54 +01:00
tools
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
AI_modules.dm
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
airlock_painter.dm
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
apc_frame.dm
Porting a couple material datums code updates and fixes.
2020-03-04 15:59:46 +01:00
balls.dm
fix
2020-02-13 16:25:43 -07:00
blueprints.dm
…
body_egg.dm
…
bodybag.dm
…
boombox.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
candle.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
cardboard_cutouts.dm
…
cards_ids.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
charter.dm
…
chrono_eraser.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
cigs_lighters.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
clown_items.dm
…
control_wand.dm
…
cosmetics.dm
…
courtroom.dm
…
crayons.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
debug_items.dm
Updates the debug outfit
2020-02-06 18:42:23 +01:00
defib.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
dehy_carp.dm
…
dice.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
dna_injector.dm
…
documents.dm
…
eightball.dm
…
extinguisher.dm
…
flamethrower.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
gift.dm
…
granters.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
handcuffs.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
his_grace.dm
…
holosign_creator.dm
…
holy_weapons.dm
Porting the musician and curator beacons.
2020-03-07 00:12:50 +01:00
hot_potato.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
inducer.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
kitchen.dm
Merge branch 'master' into more_implants
2020-02-22 18:34:02 -05:00
latexballoon.dm
…
manuals.dm
…
miscellaneous.dm
Porting the musician and curator beacons.
2020-03-07 00:12:50 +01:00
mop.dm
First tweak to cargo reagents selling.
2020-02-06 22:34:54 +01:00
paint.dm
…
paiwire.dm
…
pet_carrier.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
pinpointer.dm
actually makes contractor pinpointer do things
2020-03-02 01:36:11 +01:00
plushes.dm
Update plushes.dm
2020-02-24 02:21:51 -07:00
pneumaticCannon.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
powerfist.dm
…
RCD.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
RCL.dm
ouch
2020-03-03 22:26:56 +01:00
religion.dm
Porting the musician and curator beacons.
2020-03-07 00:12:50 +01:00
RPD.dm
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
RSF.dm
…
scrolls.dm
…
sharpener.dm
…
shields.dm
Update code/game/objects/items/shields.dm
2020-03-01 00:48:45 -05:00
shooting_range.dm
…
signs.dm
…
singularityhammer.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
stunbaton.dm
Update stunbaton.dm
2020-03-06 07:23:29 -07:00
taster.dm
…
teleportation.dm
Merge pull request #11167 from Citadel-Station-13/kevinz000-patch-11
2020-02-24 16:40:17 +01:00
teleprod.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07:00
telescopic_iv.dm
…
theft_tools.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
toys.dm
Merge pull request #10451 from kevinz000/mobility_flags
2020-03-05 20:03:56 -05:00
trash.dm
…
twohanded.dm
Merge pull request #11277 from kevinz000/sword_point
2020-03-04 17:11:39 +01:00
vending_items.dm
…
weaponry.dm
Merge pull request #11306 from Ghommie/Ghommie-cit598
2020-03-06 00:20:36 -07:00