cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
a0ab995551a0e8cb15b8ca5f0026aa5f21698cbc
CHOMPStation2/code/datums
History
Repede 4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
..
autolathe
Minor Changes
2020-02-09 22:30:18 -06:00
helper_datums
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
locations
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
looping_sounds
Final fix. I swear.
2020-02-17 14:02:10 -07:00
observation
Fixes organizations runtiming
2019-04-12 19:24:04 +10:00
outfits
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
repositories
Conflict Resolution
2019-10-06 13:12:11 -04:00
supplypacks
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
underwear
Two new undershirts (#6556)
2019-12-14 04:04:15 -05:00
uplink
[READY] Recolourable energy weapons. (#6507)
2019-11-01 12:38:06 -04:00
vending
…
wires
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
ai_law_sets_vr.dm
Compilation fixing, and Phorochem depreciation fix.
2020-01-13 20:07:30 +00:00
ai_law_sets.dm
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
ai_laws.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
api.dm
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
2019-04-07 19:40:12 -04:00
beam.dm
Refactors shadekin
2019-04-28 15:10:06 +10:00
browser.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
callback.dm
Adds Various Sounds, Looping Sound System
2019-03-27 03:55:21 -04:00
category.dm
…
computerfiles.dm
…
datacore.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
datum.dm
Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"
2019-04-08 15:24:27 -04:00
datumvars.dm
Conflict Resolution Part One
2019-03-27 15:21:58 -04:00
EPv2.dm
POLARIS: Fix several Destroy()s
2018-02-20 10:00:23 -05:00
ghost_query_vr.dm
Adds Morph Spawn event
2020-01-11 20:15:10 +10:00
ghost_query.dm
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
hierarchy.dm
…
mind_vr.dm
Makes the sickness affect only people dying via non-vore deaths, adds fluff version with no downsides
2020-01-07 17:02:39 +10:00
mind.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
mixed.dm
POLARIS: Fix several Destroy()s
2018-02-20 10:00:23 -05:00
modules.dm
…
mutable_appearance.dm
POLARIS: Tweak weird MA override
2018-02-24 13:13:10 -05:00
orbit.dm
Implements the Tesla engine and supporting features (#4539)
2018-01-19 14:56:08 -06:00
organs.dm
…
position_point_vector.dm
Fix various syntactic problems
2020-01-21 01:06:04 -05:00
progressbar.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
recipe.dm
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
riding.dm
Multi-Tile Objects, Multi-Tile Hovershuttle
2019-07-01 20:43:53 -04:00
soul_link.dm
Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 05:07:05 -04:00
sun.dm
Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed
2018-12-03 20:21:17 -05:00
weakref.dm
Unify datum var definitions
2017-12-29 14:23:13 -05:00