shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d960c45e7766810106c6ab447686620dce240036
GS13NG/code/game/objects/items
History
oranges d960c45e77 Merge pull request #33622 from duncathan/assert_gas 
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-20 00:14:13 -06:00
..
circuitboards
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
devices
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
grenades
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
implants
Update implantcase.dm
2017-12-17 17:38:09 -06:00
melee
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
robot
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
stacks
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
storage
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
tanks
Merge pull request #33622 from duncathan/assert_gas
2017-12-20 00:14:13 -06:00
tools
Update weldingtool.dm
2017-12-17 15:57:23 -06:00
AI_modules.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08: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
Performance and usability improvement for blueprints
2017-11-13 03:32:35 -06:00
body_egg.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
bodybag.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
candle.dm
…
cardboard_cutouts.dm
…
cards_ids.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
charter.dm
JSON feedback
2017-11-17 01:44:12 -06:00
chrono_eraser.dm
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
cigs_lighters.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
clown_items.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
clown.dm
…
control_wand.dm
…
cosmetics.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
courtroom.dm
…
crayons.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
defib.dm
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
dehy_carp.dm
…
dice.dm
Defines math, take 2
2017-12-17 10:02:43 -06:00
dna_injector.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
documents.dm
…
eightball.dm
…
extinguisher.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
flamethrower.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
gift.dm
…
handcuffs.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06: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
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
inducer.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
kitchen.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
latexballoon.dm
…
manuals.dm
…
miscellaneous.dm
…
mop.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
paint.dm
…
paiwire.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
pet_carrier.dm
Merge pull request #33392 from vuonojenmustaturska/patch-1
2017-12-10 02:53:02 -06:00
pinpointer.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
plushes.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
pneumaticCannon.dm
Defines math, take 2
2017-12-17 10:02:43 -06:00
powerfist.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
RCD.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
RCL.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
religion.dm
…
RPD.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08: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
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
shooting_range.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
signs.dm
…
singularityhammer.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
stunbaton.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
taster.dm
…
teleportation.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
teleprod.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
theft_tools.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
tools.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
toys.dm
Gun sounds (#33615)
2017-12-18 15:15:25 -06:00
trash.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
twohanded.dm
Adds jousting (#33531)
2017-12-18 20:54:21 -06:00
vending_items.dm
Merge branch 'master' into upstream-merge-33316
2017-12-11 00:01:02 +00:00
weaponry.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00