cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-17 12:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
f9b6171106f177fedc1bb653d9da504655e56177
CHOMPStation2/code/game/objects/items/weapons
History
Kelshark 69f700304c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	maps/virgo-1.dmm
#	maps/virgo-5.dmm
2017-01-28 00:15:12 -05:00
..
circuitboards
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
grenades
Polaris December Sync
2016-12-10 09:51:11 -05:00
implants
Merge pull request #837 from Cameron653/master
2017-01-19 00:39:08 -05:00
material
fixes
2017-01-04 19:57:57 +01:00
melee
Changes the way embedding works
2016-10-11 21:29:49 -05:00
storage
Adds hypo for CMO and adds vials in chem for them to use
2017-01-24 01:47:57 -05:00
tanks
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
AI_modules.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
autopsy.dm
Fixes the autopsy scanner bugging on print
2016-11-14 14:14:25 -06:00
candle.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
cards_ids_syndicate.dm
Syndicate id card now checks if the player mind an antag.
2015-12-10 10:55:55 +00:00
cards_ids_vr.dm
Multiple bugfixes (#477)
2016-08-14 22:00:54 -04:00
cards_ids.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
cigs_lighters.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
clown_items.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall
2016-05-28 20:22:09 +01:00
cosmetics.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
dice.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
dna_injector.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
explosives.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
extinguisher.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
flamethrower.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
game_kit.dm
…
gift_wrappaper.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
handcuffs.dm
Kills telecuffs
2016-10-23 21:31:12 -05:00
hydroponics.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
improvised_components.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
manuals.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
mop_deploy.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
mop.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
paint.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
paiwire.dm
…
policetape.dm
Merge pull request #2807 from MagmaRam/door_tape
2016-11-22 21:57:11 -06:00
power_cells.dm
Fixes device cells
2016-10-16 13:42:16 -05:00
RCD.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
RSF.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
scrolls.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
shields.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
stunbaton.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
surgery_tools.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
swords_axes_etc.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
syndie.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
tape.dm
Should fix the tape thing.
2016-10-17 16:52:20 -05:00
teleportation.dm
sandbox and map edits
2016-12-26 22:31:33 -05:00
tools.dm
sandbox and map edits
2016-12-26 22:31:33 -05:00
towels.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
traps.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
trays.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
weaponry.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
weldbackpack.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00