cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-31 03:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
85f9061592362a1065960ce551b71a112e077bf2
CHOMPStation2/code/game/objects/structures
History
Kelshark 85f9061592 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
2018-01-24 19:52:12 -05:00
..
crates_lockers
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-01-24 19:52:12 -05:00
flora
Planes Framework (#4545)
2018-01-17 13:45:54 -06:00
ghost_pods
Makes lost drone pod charger-able.
2017-11-03 14:26:59 -04:00
stool_bed_chair_nest
Merge polaris sync 01 17 2018
2018-01-17 17:56:51 -05:00
alien_props.dm
work
2017-11-26 12:08:05 -05:00
barsign.dm
…
bedsheet_bin.dm
…
bonfire.dm
Adds Boats, Ports /TG/ Buckling (#4527)
2018-01-14 14:58:15 -06:00
catwalk.dm
Adds Variable Click Delay
2017-11-28 16:11:56 -05:00
coathanger.dm
…
curtains.dm
Planes Framework (#4545)
2018-01-17 13:45:54 -06:00
displaycase.dm
Adds Variable Click Delay
2017-11-28 16:11:56 -05:00
door_assembly.dm
work
2017-11-26 12:08:05 -05:00
electricchair.dm
Adds Boats, Ports /TG/ Buckling (#4527)
2018-01-14 14:58:15 -06:00
extinguisher.dm
…
fitness.dm
Adds Variable Click Delay
2017-11-28 16:11:56 -05:00
flora_vr.dm
Merge polaris sync 01 17 2018
2018-01-17 17:56:51 -05:00
flora.dm
Surface Map Work (#4557)
2018-01-17 13:46:19 -06:00
girders.dm
Works on New Blob
2017-11-29 22:35:01 -05:00
gravemarker.dm
…
grille.dm
Polaris sync
2017-12-21 04:01:07 -05:00
inflatable.dm
Works on New Blob
2017-11-29 22:35:01 -05:00
janicart.dm
Makes janicarts hold more water (#4558)
2018-01-17 17:29:49 -06:00
kitchen_spike.dm
Meatspike fixes. (#4299)
2017-11-19 14:42:37 -06:00
lattice.dm
These are not Vorestation edits. (#4088)
2017-10-16 23:01:30 -05:00
loot_piles.dm
Makes knives all knives.
2018-01-12 18:02:07 -08:00
map_blocker_vr.dm
…
mirror.dm
…
mop_bucket.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
2018-01-19 17:52:25 -05:00
morgue_vr.dm
Polaris sync
2017-12-21 04:01:07 -05:00
morgue.dm
Planes Framework (#4545)
2018-01-17 13:45:54 -06:00
musician.dm
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-01-24 19:52:12 -05:00
noticeboard.dm
…
railing.dm
Adds Variable Click Delay
2017-11-28 16:11:56 -05:00
safe.dm
The game actually clicks when it claims to. (#4403)
2017-12-07 18:18:01 -06:00
signs.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
2017-12-26 23:07:58 -05:00
simple_doors.dm
Adds Boats, Ports /TG/ Buckling (#4527)
2018-01-14 14:58:15 -06:00
tank_dispenser.dm
…
target_stake.dm
…
transit_tubes.dm
…
trash_pile.dm
Knife path fix for VS trashpiles and a fluff item
2018-01-18 15:48:14 -05:00
under_wardrobe.dm
…
watercloset.dm
Adds Variable Click Delay
2017-11-28 16:11:56 -05:00
windoor_assembly.dm
…
window_spawner.dm
…
window.dm
Polaris sync
2017-12-21 04:01:07 -05:00