cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 08:39:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
e44e3463521a8f29945a39f1147d77ea169b6d7e
CHOMPStation2/code/game/objects/structures
T
History
Repede e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
2020-04-16 21:07:33 -04:00
..
crates_lockers
Fuck this shit
2020-04-04 14:37:55 -04:00
flora
Merge remote-tracking branch 'upstream/master'
2019-08-22 21:32:01 +01:00
ghost_pods
Clean up various things
2020-04-03 03:15:06 -04:00
props
Clean up various things
2020-04-03 03:15:06 -04:00
stool_bed_chair_nest
Clean up various things
2020-04-03 03:15:06 -04:00
barsign.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
bedsheet_bin.dm
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
bonfire.dm
…
catwalk.dm
Replace a bunch of VOREStation edits that can be sent to Polaris
2020-02-29 19:45:58 -05:00
cliff.dm
…
coathanger.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
curtains.dm
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
displaycase.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
dogbed.dm
…
door_assembly.dm
…
electricchair.dm
…
extinguisher.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
fence.dm
…
fireaxe.dm
…
fitness_vr.dm
Replace ring in holo boxing ring with actual ring. (#7209)
2020-04-13 09:33:22 -04:00
fitness.dm
…
flora_vr.dm
…
flora.dm
Hide items in plant pots and plushies
2020-02-24 16:01:08 -05:00
girders.dm
Xenowork Prep For Future (#6491)
2019-11-04 21:38:02 -05:00
gravemarker.dm
…
grille.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
handrail_vr.dm
Final touches
2019-08-15 23:18:05 -04:00
holoplant.dm
Machinery: Always use update_use_power()
2020-03-23 23:21:10 -04:00
inflatable.dm
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
janicart.dm
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
kitchen_spike.dm
…
lattice.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
ledges.dm
The great rock update.
2019-07-13 18:21:45 -04:00
lightpost.dm
…
loot_piles.dm
Replaces Tramadol maint pills with Paracetamol
2020-02-16 10:54:55 -05:00
map_blocker_vr.dm
…
medical_stand_vr.dm
Fix bug with setting icon for breather
2020-02-29 12:00:48 -05:00
mirror.dm
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-16 00:52:29 -05:00
mop_bucket.dm
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
morgue_vr.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
morgue.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
musician.dm
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
new_signs.dm
…
noticeboard.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
plasticflaps.dm
Merge pull request #6404 from Heroman3003/flappening
2019-09-22 19:53:30 -04:00
railing.dm
Combat Mechs Can Punch More Things (#6303)
2019-07-24 17:00:24 -04:00
safe.dm
…
salvageable.dm
Salvageable machines
2020-02-21 16:54:41 -05:00
signs.dm
…
simple_doors_vr.dm
Sprites 'n stuff
2020-03-06 13:03:53 -05:00
simple_doors.dm
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
snowman.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
stasis_cage.dm
Makes stasis cages use the new sprites
2019-09-28 22:01:11 +03:00
tank_dispenser.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
target_stake.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
transit_tubes.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
trash_pile_vr.dm
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
under_wardrobe.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
watercloset.dm
Machinery: Always use update_use_power()
2020-03-23 23:21:10 -04:00
windoor_assembly.dm
VChat: Redone chat output in Vue.js
2020-02-19 19:55:01 -05:00
window_spawner.dm
…
window.dm
Merge pull request #6884 from Neerti/event_system_fix
2020-04-06 16:23:39 -04:00