cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
1e45296d318d8fd6c9d903c8b0e7d91fe62e988e
CHOMPStation2/code/modules
History
Unknown 1e45296d31 Conflict Resolution
2019-03-27 10:58:53 -04:00
..
admin
Stops initialization from grinding to a halt when loading maps
2019-03-27 01:49:25 -04:00
ai
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
alarm
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
artifice
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
assembly
Standardizes rotation verbs
2019-03-27 03:17:07 -04:00
awaymissions
Sorts out this PR
2019-03-26 21:43:56 -04:00
blob
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
blob2
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
busy_space
Merge pull request #4615 from VOREStation/upstream-merge-5795
2019-03-27 03:40:16 -04:00
busy_space_vr
…
client
Conflict Resolution
2019-03-27 04:11:30 -04:00
clothing
Guns sounds refactor and improvements
2019-03-27 10:42:18 -04:00
customitems
…
detectivework
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
economy
…
entopics_vr
…
error_handler
ports #4581 Startup Runtime fix
2019-02-02 06:03:40 -06:00
events
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
examine
…
ext_scripts
…
flufftext
Guns sounds refactor and improvements
2019-03-27 10:42:18 -04:00
food
Conflict Resolution
2019-03-27 04:11:30 -04:00
gamemaster
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
games
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
genetics
…
ghosttrap
…
holodeck
Adds Various Sounds, Looping Sound System
2019-03-27 03:55:21 -04:00
holomap
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
hydroponics
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
icon generation
…
identification
Adds Identification System, New Autoinjectors
2019-03-27 02:25:55 -04:00
integrated_electronics
Merge pull request #4597 from VOREStation/upstream-merge-5786
2019-03-27 03:03:40 -04:00
library
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
lighting
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
lore_codex
Why is this even a conflict
2019-03-27 04:41:57 -04:00
maps
Adds Various Sounds, Looping Sound System
2019-03-27 03:55:21 -04:00
materials
Merge pull request #5747 from Neerti/fulltile_window_improvements
2018-12-04 14:37:19 -05:00
media
Sorts out this PR
2019-03-26 21:43:56 -04:00
metric
…
mining
Standardizes rotation verbs
2019-03-27 03:17:07 -04:00
mob
Conflict Resolution
2019-03-27 10:58:53 -04:00
multiz
Sorts out this PR
2019-03-26 21:43:56 -04:00
nano
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
nifsoft
Fixes most of the issues
2019-03-27 00:38:44 -04:00
organs
Fixes most of the issues
2019-03-27 00:38:44 -04:00
overmap
Standardizes rotation verbs
2019-03-27 03:17:07 -04:00
paperwork
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
persistence
…
planet
Conflict Resolution
2019-03-27 04:11:30 -04:00
power
Adds Various Sounds, Looping Sound System
2019-03-27 03:55:21 -04:00
projectiles
Conflict Resolution
2019-03-27 10:58:53 -04:00
random_map
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
reagents
Adds Identification System, New Autoinjectors
2019-03-27 02:25:55 -04:00
recycling
Standardizes rotation verbs
2019-03-27 03:17:07 -04:00
research
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
resleeving
Sorts out this PR
2019-03-26 21:43:56 -04:00
rogueminer_vr
Sorts out this PR
2019-03-26 21:43:56 -04:00
scripting
…
security levels
…
shieldgen
Standardizes rotation verbs
2019-03-27 03:17:07 -04:00
shuttles
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
spells
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
surgery
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
tables
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
telesci
Sorts out this PR
2019-03-26 21:43:56 -04:00
tension
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
tooltip
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
turbolift
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
vehicles
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
ventcrawl
oh my fuck travis quit complaining
2019-02-02 08:17:32 -06:00
virus2
Feedback Changes 1
2018-10-24 23:27:34 -04:00
vore
Fixes most of the issues
2019-03-27 00:38:44 -04:00
xenoarcheaology
Standardizes rotation verbs
2019-03-27 03:17:07 -04:00
xenobio
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
xenobio2
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
xgm
…