cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

VOREStation specifics for SSsupply refactor.

Browse Source 
Update vorestation.dme
This commit is contained in:
Novacat
2020-03-27 17:49:59 -04:00
committed by Leshana
parent 752d560d76
commit 8c7424b3e8
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/events/supply_demand_vr.dm
View File

@@ -74,7 +74,7 @@
// Check if the crew succeeded or failed! // Check if the crew succeeded or failed!
if(required_items.len == 0) if(required_items.len == 0)
// Success! // Success!
supply_controller.points += 100 * severity SSsupply.points += 100 * severity
var/msg = "Great work! With those items you delivered our inventory levels all match up. " var/msg = "Great work! With those items you delivered our inventory levels all match up. "
msg += "[capitalize(pick(first_names_female))] from accounting will have nothing to complain about. " msg += "[capitalize(pick(first_names_female))] from accounting will have nothing to complain about. "
msg += "I think you'll find a little something in your supply account." msg += "I think you'll find a little something in your supply account."

5
vorestation.dme
View File

@@ -225,11 +225,6 @@
#include "code\controllers\Processes\alarm.dm" #include "code\controllers\Processes\alarm.dm"
#include "code\controllers\Processes\emergencyShuttle.dm" #include "code\controllers\Processes\emergencyShuttle.dm"
#include "code\controllers\Processes\game_master.dm" #include "code\controllers\Processes\game_master.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\controllers\Processes\supply.dm"
=======
#include "code\controllers\Processes\mob.dm"
>>>>>>> dfda8ea... Merge pull request #6900 from VOREStation/vplk-sssupply:polaris.dme
#include "code\controllers\Processes\ticker.dm" #include "code\controllers\Processes\ticker.dm"
#include "code\controllers\ProcessScheduler\core\process.dm" #include "code\controllers\ProcessScheduler\core\process.dm"
#include "code\controllers\ProcessScheduler\core\processScheduler.dm" #include "code\controllers\ProcessScheduler\core\processScheduler.dm"