cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 04:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
ac7e949779d0d39ce493e1ab3517db4bb9cffaba
VOREStation/code/game/objects/items/weapons
History
Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
2018-04-15 14:19:36 -04:00
..
circuitboards
Make gas turbine constructable and operational
2018-02-22 15:43:38 -05:00
grenades
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
id cards
Initial cleanup/changes
2018-04-02 16:36:04 -04:00
implants
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
2018-03-31 09:20:59 -04:00
material
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
2018-04-15 14:19:36 -04:00
melee
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
2018-04-15 14:19:36 -04:00
storage
adds proper bags
2018-04-12 09:26:02 +03:00
tanks
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
AI_modules.dm
Constructs 2.0 - Living Stone (#5040)
2018-04-04 23:45:00 -07:00
autopsy.dm
…
bones.dm
…
candle.dm
Stop candles from messaging the universe when they light.
2018-02-22 15:25:39 -05:00
cards_ids_vr.dm
…
cigs_lighters.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
clown_items.dm
…
cosmetics.dm
…
dna_injector.dm
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
explosives.dm
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
extinguisher.dm
…
flamethrower.dm
…
game_kit.dm
…
gift_wrappaper.dm
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
handcuffs_vr.dm
Added fuzzy legcuffs
2018-04-13 04:56:16 +10:00
handcuffs.dm
Fixed legcuffs checking for being handcuffed instead of legcuffed when put on
2018-04-13 05:00:18 +10:00
hydroponics.dm
…
improvised_components.dm
…
manuals_vr.dm
…
manuals.dm
…
mop_deploy.dm
…
mop.dm
…
paint.dm
…
paiwire.dm
…
policetape.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
power_cells.dm
…
RCD.dm
Constructs 2.0 - Living Stone (#5040)
2018-04-04 23:45:00 -07:00
RSF.dm
…
scrolls.dm
…
shields_vr.dm
…
shields.dm
…
stunbaton.dm
…
surgery_tools.dm
…
swords_axes_etc.dm
…
syndie.dm
Ater poi3 (#4968)
2018-03-05 19:55:27 -06:00
tape.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
teleportation.dm
…
tools.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
towels.dm
…
traps.dm
…
trays.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
weaponry.dm
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
weldbackpack.dm
…