cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 21:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
7dbdfdda01a645771ca35eabcb1445405dc08947
VOREStation/code/game/objects/items/weapons
History
Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
2016-11-04 15:42:32 -04:00
..
circuitboards
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
grenades
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2016-10-20 21:24:07 -04:00
implants
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
material
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
melee
Changes the way embedding works
2016-10-11 21:29:49 -05:00
storage
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
2016-11-04 15:42:32 -04: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
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04: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
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04: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
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
tools.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04: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