cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-17 12:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
a269d28a8b206c192461fe443d83a223b8a93a7d
CHOMPStation2/code/game/objects/items/weapons
History
Razgriz a269d28a8b Merge pull request #805 from CHOMPStationBot/upstream-merge-9276 
[MIRROR] [MIRROR] No more unnearsightedness!
2020-11-05 03:19:31 -07:00
..
circuitboards
Fixing conflicts
2020-10-05 18:10:53 -07:00
grenades
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
id cards
Fixing conflicts
2020-10-05 18:10:53 -07:00
implants
Makes cascading toggleable
2020-11-02 23:46:52 -05:00
material
Merge pull request #9235 from VOREStation/upstream-merge-7726
2020-10-19 10:37:24 +00:00
melee
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
storage
Yummy bugfixes
2020-10-27 19:58:49 -07:00
tanks
Fix duplicate results from analyzing some objects (#7660)
2020-09-20 07:18:35 -04:00
tools
Merge pull request #9276 from VOREStation/upstream-merge-7753
2020-11-05 10:06:02 +00:00
AI_modules_vr.dm
Fixes indent errors
2020-09-01 20:37:56 +10:00
AI_modules.dm
Adds board versions of a bunch of lawsets (#7611)
2020-09-05 10:20:42 -04:00
augment_items.dm
Adds two new augments to Traitor uplink
2020-09-20 06:49:58 -04:00
autopsy.dm
Tweaks to pickup/equip sounds.
2020-09-20 06:57:07 -04:00
bones.dm
…
candle.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
canes.dm
…
cards_ids_vr.dm
…
chewables.dm
Flavour Enhancement: Vending
2020-08-20 21:25:31 -04:00
cigs_lighters.dm
Vendor enhancement fixes (#7577)
2020-08-30 02:49:00 -04:00
clown_items.dm
…
cosmetics.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
dna_injector.dm
Colony Director -> Site Manager
2020-08-27 20:43:04 -04:00
ecigs.dm
Flavour Enhancement: Vending
2020-08-20 21:25:31 -04:00
explosives_vr.dm
…
explosives.dm
…
extinguisher.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
flamethrower.dm
Fix duplicate results from analyzing some objects (#7660)
2020-09-20 07:18:35 -04:00
game_kit.dm
…
gift_wrappaper.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
handcuffs_vr.dm
…
handcuffs.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
hydroponics.dm
…
improvised_components.dm
…
inducer_vr.dm
…
lego.dm
Kassc's death lego
2020-08-17 10:05:47 -04:00
manuals_vr.dm
…
manuals.dm
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
mop_deploy.dm
…
mop.dm
…
paint.dm
…
paiwire.dm
…
policetape.dm
…
power_cells.dm
…
RCD_vr.dm
…
RCD.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
RMS_vr.dm
I missed a few commas
2020-09-15 23:14:21 -07:00
RPD_vr.dm
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
RSF.dm
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-22 20:07:45 +02:00
scrolls.dm
…
shields_vr.dm
please work PLEASE
2020-09-29 00:28:25 -04:00
shields_yw.dm
…
shields.dm
…
stunbaton.dm
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
surgery_tools_ch.dm
Adding dehusk and tox/oxyloss surgery
2020-10-21 23:32:27 -07:00
surgery_tools.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
swords_axes_etc.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
syndie.dm
…
tape.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
taskmanager_ch.dm
Update scannable fabricator pathname
2020-09-26 15:13:00 -07:00
teleportation.dm
…
towels.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
traps_vr.dm
…
traps.dm
…
trays.dm
…
weaponry.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
weldbackpack.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00