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
4a05c9e7e114fa4dc4332dbbb618dbc15c80e9da
CHOMPStation2/code/modules
History
Novacat 4a05c9e7e1 Merge pull request #4782 from VOREStation/upstream-merge-5966 
[MIRROR] Fixes blast door issue, and slimesky being considered unjustified.
2019-03-28 21:07:14 -04:00
..
admin
Merge branch 'master' into upstream-merge-5905
2019-03-28 14:55:54 -04:00
ai
Fixes blast door issue, and slimesky being considered unjustified.
2019-03-28 20:35:17 -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
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
blob2
Rewrites Atmospherics
2019-03-28 19:25:11 -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-28 17:24:03 -04:00
clothing
Merge branch 'master' into upstream-merge-5959
2019-03-28 20:30:41 -04:00
customitems
…
detectivework
[READY]Makes a bunch of processes subsystems instead
2019-03-27 16:03:51 -04:00
economy
Merge pull request #4684 from VOREStation/upstream-merge-5814
2019-03-27 17:46:31 -04:00
entopics_vr
…
error_handler
ports #4581 Startup Runtime fix
2019-02-02 06:03:40 -06:00
events
Conflict Resolution
2019-03-27 16:36:41 -04:00
examine
Adds pressure protection bounds to clothing.
2019-03-27 13:26:07 -04:00
ext_scripts
…
flufftext
Guns sounds refactor and improvements
2019-03-27 10:42:18 -04:00
food
Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 16:54:32 -04:00
gamemaster
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 14:49:30 -04:00
games
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
genetics
…
ghosttrap
…
holodeck
Rewrites Atmospherics
2019-03-28 19:25:11 -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
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
icon generation
…
identification
Adds Identification System, New Autoinjectors
2019-03-27 02:25:55 -04:00
integrated_electronics
Update time.dm
2019-03-28 14:41:14 -04:00
library
Merge pull request #4746 from VOREStation/upstream-merge-5922
2019-03-28 16:38:18 -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
Merge branch 'master' into upstream-merge-5908
2019-03-28 15:19:53 -04:00
maps
Conflict Resolution
2019-03-27 13:02:35 -04:00
materials
Merge pull request #5747 from Neerti/fulltile_window_improvements
2018-12-04 14:37:19 -05:00
media
Conflict Resolution Part 2
2019-03-27 15:51:05 -04:00
metric
…
mining
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 14:49:30 -04:00
mob
Merge pull request #4782 from VOREStation/upstream-merge-5966
2019-03-28 21:07:14 -04:00
multiz
Merge pull request #4739 from VOREStation/upstream-merge-5924
2019-03-28 17:55:27 -04:00
nano
Merge pull request #4775 from VOREStation/upstream-merge-5961
2019-03-28 20:24:38 -04:00
nifsoft
Conflict Resolution
2019-03-27 16:36:41 -04:00
organs
Merge pull request #4781 from VOREStation/upstream-merge-5969
2019-03-28 20:46:05 -04:00
overmap
Merge pull request #4684 from VOREStation/upstream-merge-5814
2019-03-27 17:46:31 -04:00
paperwork
[READY]Makes a bunch of processes subsystems instead
2019-03-27 16:03:51 -04:00
persistence
…
planet
Conflict Resolution
2019-03-27 04:11:30 -04:00
power
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
projectiles
Merge pull request #4763 from VOREStation/upstream-merge-5950
2019-03-28 20:22:52 -04:00
random_map
Upgrades SDQL2 and refactors it to a datum
2019-03-27 11:50:49 -04:00
reagents
Tweaks Daxons
2019-03-28 20:29:05 -04:00
recycling
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
research
Changes (R&D made) Saber SMG to Advanced SMG
2019-03-28 18:22:23 -04:00
resleeving
Conflict Resolution
2019-03-27 16:36:41 -04:00
rogueminer_vr
Conflict Resolution
2019-03-27 16:36:41 -04:00
scripting
…
security levels
…
shieldgen
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
shuttles
[READY]Makes a bunch of processes subsystems instead
2019-03-27 16:03:51 -04:00
spells
[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
surgery
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
tables
Conflict Resolution
2019-03-28 19:41:16 -04:00
telesci
Merge pull request #4684 from VOREStation/upstream-merge-5814
2019-03-27 17:46:31 -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
[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
vehicles
Adds New PoI Features + Bonus PoI
2019-03-27 12:15:50 -04:00
ventcrawl
oh my fuck travis quit complaining
2019-02-02 08:17:32 -06:00
virus2
Merge pull request #4684 from VOREStation/upstream-merge-5814
2019-03-27 17:46:31 -04:00
vore
Merge pull request #4764 from Sharkmare/patch-4
2019-03-28 20:23:01 -04:00
xenoarcheaology
Merge pull request #4684 from VOREStation/upstream-merge-5814
2019-03-27 17:46:31 -04:00
xenobio
Merge pull request #4643 from VOREStation/upstream-merge-5790
2019-03-28 15:48:47 -04:00
xenobio2
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
xgm
…