shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
321df15afd27225bb830c142a11b615fcb6ed1fc
GS13NG/code/game/objects/items
History
deathride58 2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
..
circuitboards
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
devices
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
grenades
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
implants
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
melee
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
robot
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
stacks
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
storage
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
tanks
Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631)
2018-05-22 22:11:23 -05:00
tools
Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay
2018-05-25 10:49:21 -05:00
AI_modules.dm
Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER
2018-05-01 15:40:09 -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
[MIRROR] Replaced body zone magic strings with defines (#6004)
2018-03-19 21:18:57 -05:00
bodybag.dm
Kills off three more flags from flags_2
2018-04-29 17:30:55 -05:00
candle.dm
Update candle.dm
2018-01-21 23:07:11 -06:00
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
JSON feedback
2017-11-17 01:44:12 -06:00
chrono_eraser.dm
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
cigs_lighters.dm
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07: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
[MIRROR] Does some code standardization/consistency. (#3161)
2017-10-21 06:10:22 -05:00
dice.dm
d (#36046)
2018-03-03 00:31:35 -06:00
dna_injector.dm
[MIRROR] Converts several species traits into generic traits (#5710)
2018-03-05 12:34:01 -06:00
documents.dm
…
eightball.dm
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
extinguisher.dm
[READY] Refactors wet floors to a component (#36130)
2018-03-17 07:53:11 -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
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
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
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
hot_potato.dm
Fixes hot potato coloration (#36655)
2018-03-28 12:17:45 -05:00
inducer.dm
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
kitchen.dm
[MIRROR] Replaced body zone magic strings with defines (#6004)
2018-03-19 21:18:57 -05:00
latexballoon.dm
…
manuals.dm
Refactors Spell and Martial Art Books to use Action Granters!
2018-03-28 12:18:06 -05:00
miscellaneous.dm
…
mop.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
paint.dm
[MIRROR] Does some code standardization/consistency. (#3161)
2017-10-21 06:10:22 -05:00
paiwire.dm
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
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
[MIRROR] A Nar-Sie Plushie can be used an an extra invoker now! (#5723)
2018-02-27 05:03:07 -06: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
Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679)
2018-02-16 00:41:04 -06:00
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
[MIRROR] Renames various reagent IDs to be more descriptive (#5634)
2018-02-24 09:35:48 -06:00
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
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
[s]Fixes writing bugs/exploits
2018-02-15 16:10:03 -06:00
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
[READY] Properly Adds a suicide action to the hand tele
2018-05-08 20:08:03 -05:00
teleprod.dm
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
theft_tools.dm
Tg 1 28 sync testing/confirmation (#5178)
2018-01-29 04:42:29 -06:00
toys.dm
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
trash.dm
code folder. 221 files changed wew
2018-02-12 21:03:40 -05:00
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