cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 21:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
8d2ec5f7fa62b83cb2eabf2283ffc3072e3efb21
CHOMPStation2/code/game/objects/items/weapons
History
Repede c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
2020-03-01 12:35:52 -05:00
..
circuitboards
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
grenades
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
id cards
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
implants
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
material
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
melee
Fixes Elven Weapons
2019-12-06 19:14:35 -05:00
storage
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
tanks
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
tools
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
AI_modules.dm
…
autopsy.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
bones.dm
…
candle.dm
…
cards_ids_vr.dm
…
cigs_lighters.dm
Adds holster, lighter, and seatbelt sounds from World Server.
2020-02-24 16:12:37 -05:00
clown_items.dm
…
cosmetics.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
dna_injector.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
explosives_vr.dm
…
explosives.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
extinguisher.dm
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
flamethrower.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
game_kit.dm
…
gift_wrappaper.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
handcuffs_vr.dm
…
handcuffs.dm
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
hydroponics.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
improvised_components.dm
…
manuals_vr.dm
…
manuals.dm
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
mop_deploy.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
mop.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
paint.dm
Replaces lentext with length
2019-12-12 13:13:18 -05:00
paiwire.dm
…
policetape.dm
…
power_cells.dm
…
RCD.dm
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
RPD.dm
Update RPD.dm
2020-01-12 00:35:04 -08:00
RSF.dm
Adds Change Tags
2019-12-22 21:14:09 -06:00
scrolls.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
shields_vr.dm
Fixes Elven Weapons
2019-12-06 19:14:35 -05:00
shields_yw.dm
…
shields.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
stunbaton.dm
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
surgery_tools.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
swords_axes_etc.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
syndie.dm
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
tape.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
teleportation.dm
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
towels.dm
…
traps_vr.dm
…
traps.dm
Ports precision placement of items
2020-02-22 02:35:41 -05:00
trays.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
weaponry.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
weldbackpack.dm
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00