shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d54dae8ddf27a7c8e5eb9244aa5086138ba317fa
GS13NG/code/game/objects/items
History
deathride58 d54dae8ddf Merge pull request #4918 from Citadel-Station-13/upstream-merge-34552 
[MIRROR] All crew can purify the Blood Bastard Sword (again)
2018-01-19 00:32:50 +00:00
..
circuitboards
[READY]Cargo Update: Nanotrasen Supply Drop Pods!
2018-01-10 03:12:07 -06:00
devices
[READY] Allows the supermatter's radiation collectors to produce research points in short bursts (#33916)
2018-01-17 11:18:21 -06:00
grenades
Merge pull request #34413 from kevinz000/patch-430
2018-01-16 14:28:17 -06:00
implants
Removes some hrefs from logging (#34310)
2018-01-12 07:04:39 -06:00
melee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311
2018-01-01 07:00:34 -06:00
robot
Merge pull request #34161 from ShizCalev/bot_sssembly
2018-01-13 04:23:03 -06:00
stacks
ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS
2018-01-17 23:51:54 -05:00
storage
Merge pull request #34552 from Robustin/revert3
2018-01-18 16:59:39 -06:00
tanks
Merge pull request #34475 from ShizCalev/internals-metal
2018-01-16 08:34:13 -06:00
tools
Greyscale wirecutters (#34385)
2018-01-15 15:16:47 -06:00
AI_modules.dm
Cleans up some redundant stripped_input usage
2018-01-16 14:32:25 -06:00
airlock_painter.dm
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
apc_frame.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
blueprints.dm
Cleans up some redundant stripped_input usage
2018-01-16 14:32:25 -06:00
body_egg.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
bodybag.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
candle.dm
…
cardboard_cutouts.dm
…
cards_ids.dm
Update cards_ids.dm
2018-01-17 02:36:39 -06:00
charter.dm
JSON feedback
2017-11-17 01:44:12 -06:00
chrono_eraser.dm
Clean up a bunch of undefined arg runtimes
2018-01-07 20:53:12 -06:00
cigs_lighters.dm
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
clown_items.dm
[READY]Component Forensics and Item Blood OverlayS!
2017-12-27 15:19:14 -06:00
clown.dm
…
control_wand.dm
…
cosmetics.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
courtroom.dm
…
crayons.dm
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
defib.dm
Merge pull request #34209 from ShizCalev/defib-icon-fixes
2018-01-10 06:55:23 -06:00
dehy_carp.dm
…
dice.dm
Defines math, take 2
2017-12-17 10:02:43 -06:00
dna_injector.dm
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
documents.dm
…
eightball.dm
…
extinguisher.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
flamethrower.dm
Merge pull request #33960 from ShizCalev/flamer
2017-12-31 10:02:59 -06:00
gift.dm
[MIRROR] Christmas (#4491)
2017-12-22 13:14:25 -08:00
handcuffs.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
his_grace.dm
Defines math, take 2
2017-12-17 10:02:43 -06:00
holosign_creator.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
holy_weapons.dm
Merge pull request #4917 from Citadel-Station-13/upstream-merge-34529
2018-01-19 00:32:26 +00:00
inducer.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
kitchen.dm
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
latexballoon.dm
…
manuals.dm
…
miscellaneous.dm
…
mop.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
paint.dm
…
paiwire.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
pet_carrier.dm
Merge pull request #33392 from vuonojenmustaturska/patch-1
2017-12-10 02:53:02 -06:00
pinpointer.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
plushes.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
pneumaticCannon.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
powerfist.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
RCD.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
RCL.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
religion.dm
…
RPD.dm
Merge pull request #34429 from AutomaticFrenzy/patch/rpd-bad-placement
2018-01-16 14:26:53 -06:00
RSF.dm
…
scrolls.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
sharpener.dm
Defines math, take 2
2017-12-17 10:02:43 -06:00
shields.dm
Update shields.dm
2018-01-10 14:49:35 -05:00
shooting_range.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
signs.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
singularityhammer.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
stunbaton.dm
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
taster.dm
…
teleportation.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
teleprod.dm
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
theft_tools.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
tools.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
toys.dm
Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears
2017-12-20 00:14:28 -06:00
trash.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
twohanded.dm
Merge pull request #34206 from ShizCalev/fireaxe-drop
2018-01-11 14:02:42 -06:00
vending_items.dm
Merge branch 'master' into upstream-merge-33316
2017-12-11 00:01:02 +00:00
weaponry.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00