cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 10:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
1c3f1b245481e8fffcdaa75d5ad65f30bc98c351
CHOMPStation2/code/datums
History
Repede 7c6aadd829 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
2018-03-23 20:25:18 -04:00
..
autolathe
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
helper_datums
VS: Rewrites basically all of how bellies work
2018-02-27 13:29:45 -05:00
locations
…
observation
…
outfits
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
2018-02-23 21:55:42 -05:00
repositories
Tweaks Lead & Radiation Resistance
2018-02-12 07:10:26 -05:00
supplypacks
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
underwear
U_I Phase 1.0: First consolidation pass
2018-03-08 19:31:43 -05:00
uplink
9mm pistol updates (#4480)
2018-01-14 14:45:15 -06:00
vending
…
wires
What's Yours Is Mined (#4556)
2018-02-09 18:56:46 -08:00
ai_law_sets.dm
Fixes gravekeeper module wood synth, fixes typo in gravekeeper lawset (#4506)
2018-01-06 20:20:01 -06:00
ai_laws.dm
…
api.dm
…
beam.dm
Ports the Paradise rewrite of TG rewrite of the Beam() proc
2018-01-13 18:34:33 -05:00
browser.dm
…
callback.dm
Ports callback datum from TG
2018-02-05 15:50:14 -05:00
category.dm
…
computerfiles.dm
…
datacore.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
datum.dm
Implemented basic GLOB and TGS3's DMAPI
2018-02-27 18:31:13 -05:00
datumvars.dm
Implemented basic GLOB and TGS3's DMAPI
2018-02-27 18:31:13 -05:00
EPv2.dm
POLARIS: Fix several Destroy()s
2018-02-20 10:00:23 -05:00
ghost_query.dm
Makes a dark ritual even darker (#4923)
2018-02-23 13:16:26 -06:00
hierarchy.dm
…
mind.dm
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -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
…
progressbar.dm
POLARIS: Fix several Destroy()s
2018-02-20 10:00:23 -05:00
recipe.dm
…
riding.dm
Adds Boats, Ports /TG/ Buckling (#4527)
2018-01-14 14:58:15 -06:00
sun.dm
…
weakref.dm
Unify datum var definitions
2017-12-29 14:23:13 -05:00