cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 04:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
6e8667e948b069d481e04578532d652b997b2dbd
VOREStation/code/game/objects/items/weapons
History
Arokha Sieyes 6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync 
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
2017-03-13 01:29:01 -04:00
..
circuitboards
Merge large polaris changes
2017-03-02 22:44:17 -05:00
grenades
Polaris December Sync
2016-12-10 09:51:11 -05:00
implants
Improves AR glasses, makes them available
2017-03-05 20:58:59 -05: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
Fix Tempest's Saddlebags, redo how Saddlebags Work
2017-02-23 19:20:51 -05:00
tanks
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync
2017-03-13 01:29:01 -04:00
AI_modules.dm
Ports a large chunk of the map datum system that europa/bay uses.
2017-02-27 07:36:41 -05: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
…
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
Minor smoking update
2017-02-24 17:15:38 -06:00
clown_items.dm
…
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
This should be the other way around
2017-02-06 16:21:06 -05: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
Ports a large chunk of the map datum system that europa/bay uses.
2017-02-27 07:36:41 -05: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
Fixes descriptions on 3 surgical tools
2017-03-02 14:08:13 -05: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
Fixes up and implements the experimental welding tool
2016-11-20 18:59:06 +00: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
Fix two extra robust bugs
2017-03-03 16:25:53 -05: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