cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
33c345c34a2b05b10e1f73c3a6f04c6054bd83fe
CHOMPStation2/code/modules
History
Hawk_v3 33c345c34a Fixing lists for merge. 
Missing commas, man.
2020-01-13 18:45:44 +00:00
..
admin
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
ai
Testfix/reset filediff
2019-11-13 05:00:38 -07:00
alarm
…
artifice
…
assembly
…
awaymissions
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
2019-11-29 19:13:53 -05:00
blob
…
blob2
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-16 00:52:29 -05:00
busy_space
…
busy_space_vr
We're not on Virgo anymore
2019-12-31 04:51:44 -05:00
catalogue
i probably should have tried to compile this before making the PR but i'm not that smart
2019-12-31 05:06:37 -05:00
client
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
clothing
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
customitems
…
detectivework
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
DMAPI
…
economy
Adds f13 (Mauser) brand cigarettes to game vending machines.
2019-10-17 19:09:57 -04:00
entopics_vr
…
error_handler
…
events
Fixing lists for merge.
2020-01-13 18:45:44 +00:00
examine
Adds f13 (Mauser) brand cigarettes to game vending machines.
2019-10-17 19:09:57 -04:00
ext_scripts
…
fishing
Adds sharks
2019-12-22 17:32:49 +01:00
flufftext
Replaces lentext with length
2019-12-12 13:13:18 -05:00
food
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
gamemaster
Merge remote-tracking branch 'upstream/master'
2020-01-06 00:47:53 +00:00
games
…
genetics
…
ghosttrap
…
holodeck
More updates
2019-12-06 18:24:18 -05:00
holomap
Atmos Intake Refactor
2019-12-12 00:48:02 -05:00
hydroponics
Merge remote-tracking branch 'upstream/master'
2020-01-13 18:37:42 +00:00
icon generation
…
identification
…
integrated_electronics
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-16 00:52:29 -05:00
interserver shipping
…
library
Moves custom books to main repo. (#6576)
2019-12-20 01:04:47 -05:00
lighting
…
lore_codex
Compatability, Re-enables old library
2019-11-08 10:47:32 -05:00
maps
…
materials
Testfix/reset filediff
2019-11-13 05:00:38 -07:00
media
…
metric
…
mining
Proper syntax and commenting
2020-01-05 11:21:34 -05:00
mob
Fixing lists for merge.
2020-01-13 18:45:44 +00:00
modular_computers
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
multi-tile
…
multiz
Merge Upstream
2019-11-22 23:40:13 +00:00
nano
Earlyports runtime fix
2019-10-21 20:40:56 -04:00
nifsoft
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
organs
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
overmap
…
paperwork
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
persistence
…
Phorochemistry
Fixes outdoor platings
2019-12-09 12:04:41 -05:00
planet
Map atmosphere fixes and cleanup of map defines and code for atmos stuff.
2019-12-02 17:30:40 -05:00
power
Never actually committed that not idea why tortis git thinks i did
2020-01-05 10:36:12 +01:00
projectiles
Revert "Revert "Major map change+misc changes""
2020-01-12 01:19:47 -05:00
radiation
Merge pull request #6623 from Heroman3003/radfix
2020-01-12 18:18:17 -05:00
random_map
…
reagents
Merge remote-tracking branch 'upstream/master'
2020-01-13 18:37:42 +00:00
recycling
…
research
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
resleeving
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
rogueminer_vr
…
scripting
Replaces lentext with length
2019-12-12 13:13:18 -05:00
security levels
…
shieldgen
…
shuttles
…
spells
…
surgery
513 Compatability
2019-12-12 10:40:27 -05:00
tables
…
telesci
…
tension
Testfix/reset filediff
2019-11-13 05:00:38 -07:00
tooltip
…
turbolift
Merge pull request #6551 from Heroman3003/dropfix
2019-11-29 19:49:25 -05:00
vehicles
…
ventcrawl
…
virus2
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-16 00:52:29 -05:00
vore
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
xenoarcheaology
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
xenobio
…
xenobio2
…
xgm
…