cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
e44e3463521a8f29945a39f1147d77ea169b6d7e
CHOMPStation2/code/__defines
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
..
__513_compatibility.dm
513 Compatability
2019-12-12 10:40:27 -05:00
_compile_options.dm
Replaced "area" shuttles with "landmark" shuttles.
2020-03-05 10:29:08 -05:00
_globals.dm
…
_lists.dm
Merge branch 'master' into upstream-merge-6762
2020-03-09 01:45:23 -04:00
_planes+layers_vr.dm
Fixes layering on some machines
2019-04-10 04:56:00 +10:00
_planes+layers.dm
Looking Glass Holodecks
2020-04-02 23:42:47 -04:00
_protect.dm
Adds an In-game Feedback System
2020-02-24 16:35:08 -05:00
_tick.dm
Revert "Okay this was not a good change"
2020-04-14 13:21:20 -04:00
admin_vr.dm
Adjust icon
2020-04-16 13:50:43 -04:00
admin.dm
…
appearance.dm
…
atmos.dm
Ported Basic Overmap Functionality
2020-03-11 11:11:40 -04:00
belly_modes_vr.dm
Thickbelly Functionality
2019-09-22 14:50:28 -04:00
callbacks.dm
…
chemistry_vr.dm
Makes grey don't take damage from sulphuric acid
2020-02-09 23:34:01 -03:00
chemistry.dm
Medical Expansion
2019-10-19 23:28:38 -04:00
color.dm
Adds point defense batteries to defend against meteors
2020-04-01 21:30:30 -04:00
construction.dm
Release Update
2020-04-16 21:07:33 -04:00
damage_organs.dm
Exploration Expansion 1: Or, How I Learned To Love The Tree
2019-08-21 17:23:07 -04:00
dna.dm
…
flags.dm
Allows liquidfoods to be eaten through protective gear
2019-04-27 19:54:46 -04:00
gamemode.dm
Refactor the gameticker into SSticker
2020-04-10 11:41:38 -04:00
holomap.dm
…
integrated_circuits.dm
…
inventory_sizes.dm
…
is_helpers.dm
Make shield sprites look nicer hopefully
2020-04-12 20:51:07 -04:00
items_clothing.dm
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
2019-04-07 19:40:12 -04:00
lighting_vr.dm
Updates lighting to match new numbers
2019-07-02 11:28:09 +10:00
lighting.dm
Adds a verb for rideable mobs to toggle rider control without a riding crop.
2019-12-26 17:57:26 +02:00
machinery.dm
Release Update
2020-04-16 21:07:33 -04:00
map.dm
Increases edge buffer, fixes active edges
2019-06-25 15:52:42 +10:00
math_physics.dm
[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
2019-03-27 22:02:07 -04:00
math.dm
513 Compatability
2019-12-12 10:40:27 -05:00
MC.dm
Refactor the gameticker into SSticker
2020-04-10 11:41:38 -04:00
misc_vr.dm
VS: ITV Talon offmap spawn map
2020-04-11 12:04:39 -04:00
misc.dm
Fuck this shit
2020-04-04 14:37:55 -04:00
mobs_vr.dm
VR Cloaking framework
2020-03-23 21:34:32 -04:00
mobs_yw.dm
Adds grey, sprites for items, (jumpsuit etc.) for them, add them to rigsuit list, and also adds their language that they use and telepathy
2020-02-05 19:43:55 -03:00
mobs.dm
Adds atom/movable cloaking framework
2020-03-23 21:34:32 -04:00
nifsoft.dm
Removes Security NIF Monitor
2019-03-29 09:50:28 -04:00
objects.dm
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
overmap.dm
Ports overmap events from Baystation12
2020-03-19 20:29:43 -04:00
planets.dm
Adds Various Sounds, Looping Sound System
2019-03-27 03:55:21 -04:00
preferences.dm
Adds preference to output description_info with examine text (#6969)
2020-04-10 01:21:21 -04:00
process_scheduler.dm
…
qdel.dm
Replaced "area" shuttles with "landmark" shuttles.
2020-03-05 10:29:08 -05:00
research.dm
Base features for Precursotech and Anomalotech Expansion
2019-04-13 22:44:52 -04:00
roguemining_vr.dm
…
server_tools.config.dm
…
server_tools.dm
revering back to collar commit
2019-03-11 23:13:04 -04:00
shields.dm
Ports advanced shield generators from Baystation
2020-04-03 00:56:15 -04:00
shuttle.dm
Ported Basic Overmap Functionality
2020-03-11 11:11:40 -04:00
sound.dm
Adds Sound Code and toggles
2019-10-13 02:05:16 -05:00
species_languages_vr.dm
Ports pan-slavic from Baystation
2019-09-18 15:57:30 -04:00
species_languages_YW.dm
Adds grey, sprites for items, (jumpsuit etc.) for them, add them to rigsuit list, and also adds their language that they use and telepathy
2020-02-05 19:43:55 -03:00
species_languages.dm
Release Update
2020-04-16 21:07:33 -04:00
sqlite_defines.dm
Adds an In-game Feedback System
2020-02-24 16:35:08 -05:00
stat_tracking.dm
…
subsystems_vr.dm
…
subsystems.dm
Merge pull request #7177 from VOREStation/sscleanup/openspace
2020-04-12 21:55:20 -04:00
supply.dm
…
targeting.dm
…
turfs.dm
…
typeids.dm
Merge pull request #6982 from VOREStation/vplk-fix-vv-lists
2020-04-11 02:56:48 -04:00
unit_tests.dm
…
vote.dm
…
vv.dm
Merge pull request #6982 from VOREStation/vplk-fix-vv-lists
2020-04-11 02:56:48 -04:00
xenoarcheaology.dm
Xenoarch Expansion
2020-03-24 21:43:27 -04:00
ZAS.dm
…