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

Merge pull request #3555 from Woodratt/WR_6302017_Mapstuff

Browse Source 
Woodrat breaks map stuff
This commit is contained in:
Anewbe
2017-07-06 17:43:09 -05:00
committed by GitHub
parent 387b04f50a e75c3887b7
commit bbfb6f01fe
37 changed files with 31868 additions and 14177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
View File

@@ -18,7 +18,7 @@
var/fabricator_tag = "Upper Level"
var/drone_progress = 0
var/produce_drones = 1
var/produce_drones = 2
var/time_last_drone = 500
var/drone_type = /mob/living/silicon/robot/drone
@@ -27,7 +27,7 @@
/obj/machinery/drone_fabricator/derelict
name = "construction drone fabricator"
fabricator_tag = "Depths"
fabricator_tag = "Upper Level Construction"
drone_type = /mob/living/silicon/robot/drone/construction
/obj/machinery/drone_fabricator/New()

3
code/modules/shuttles/shuttle.dm
View File

@@ -12,10 +12,11 @@
var/datum/computer/file/embedded_program/docking/docking_controller //the controller itself. (micro-controller, not game controller)
var/arrive_time = 0 //the time at which the shuttle arrives when long jumping
var/flags = SHUTTLE_FLAGS_PROCESS
var/category = /datum/shuttle
var/ceiling_type = /turf/unsimulated/floor/shuttle_ceiling
/datum/shuttle/New()
..()
if(src.name in shuttle_controller.shuttles)