cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-03 21:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
aea1eee61535575b133bdfc72c9faeb2da0b5240
CHOMPStation2/code/game/objects/items/weapons
History
Kelshark aea1eee615 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt
2018-02-21 22:19:24 -05:00
..
circuitboards
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
grenades
Planes Framework (#4545)
2018-01-17 13:45:54 -06:00
id cards
Cleans up references to assistant
2018-01-31 00:55:13 -05:00
implants
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
2018-01-04 22:44:04 -05:00
material
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -05:00
melee
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
storage
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
tanks
Merge polaris sync 01 17 2018
2018-01-17 17:56:51 -05:00
AI_modules.dm
…
autopsy.dm
…
candle.dm
…
cards_ids_vr.dm
…
cigs_lighters.dm
Adds Bonfires
2018-01-05 02:35:19 -05:00
clown_items.dm
grammar never ends (#4421)
2017-12-08 15:30:34 -06:00
cosmetics.dm
Planes Framework (#4545)
2018-01-17 13:45:54 -06:00
dna_injector.dm
…
explosives.dm
…
extinguisher.dm
…
flamethrower.dm
…
game_kit.dm
…
gift_wrappaper.dm
…
handcuffs.dm
Replaces most of the gender macros. (#4681)
2018-02-03 14:40:09 -06:00
hydroponics.dm
…
improvised_components.dm
…
manuals_vr.dm
…
manuals.dm
Added operating manual book for Tesla
2018-01-19 17:26:45 -05:00
mop_deploy.dm
…
mop.dm
…
paint.dm
…
paiwire.dm
Polaris sync
2017-12-21 04:01:07 -05:00
policetape.dm
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
power_cells.dm
9mm pistol updates (#4480)
2018-01-14 14:45:15 -06:00
RCD.dm
Adds Missing Ceiling Overlay + Fixes Space on Roof
2018-01-22 14:27:19 -05:00
RSF.dm
…
scrolls.dm
…
shields_vr.dm
AwooCosplayCrate
2018-02-08 12:57:18 -06:00
shields.dm
…
stunbaton.dm
Replaces most of the gender macros. (#4681)
2018-02-03 14:40:09 -06:00
surgery_tools.dm
Replaces most of the gender macros. (#4681)
2018-02-03 14:40:09 -06:00
swords_axes_etc.dm
…
syndie.dm
…
tape.dm
…
teleportation.dm
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-01-24 19:52:12 -05:00
tools.dm
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -05:00
towels.dm
…
traps.dm
Replaces most of the gender macros. (#4681)
2018-02-03 14:40:09 -06:00
trays.dm
…
weaponry.dm
Replaces most of the gender macros. (#4681)
2018-02-03 14:40:09 -06:00
weldbackpack.dm
…