cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/procedural_mapping/mapGenerator.dm
View File

@@ -152,23 +152,23 @@
var/endInput = input(usr,"End turf of Map (X;Y;Z)", "Map Gen Settings", "[world.maxx];[world.maxy];[mob ? mob.z : 1]") as text
//maxx maxy and current z so that if you fuck up, you only fuck up one entire z level instead of the entire universe
if(!startInput || !endInput)
src << "Missing Input"
to_chat(src, "Missing Input")
return
var/list/startCoords = splittext(startInput, ";")
var/list/endCoords = splittext(endInput, ";")
if(!startCoords || !endCoords)
src << "Invalid Coords"
src << "Start Input: [startInput]"
src << "End Input: [endInput]"
to_chat(src, "Invalid Coords")
to_chat(src, "Start Input: [startInput]")
to_chat(src, "End Input: [endInput]")
return
var/turf/Start = locate(text2num(startCoords[1]),text2num(startCoords[2]),text2num(startCoords[3]))
var/turf/End = locate(text2num(endCoords[1]),text2num(endCoords[2]),text2num(endCoords[3]))
if(!Start || !End)
src << "Invalid Turfs"
src << "Start Coords: [startCoords[1]] - [startCoords[2]] - [startCoords[3]]"
src << "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]"
to_chat(src, "Invalid Turfs")
to_chat(src, "Start Coords: [startCoords[1]] - [startCoords[2]] - [startCoords[3]]")
to_chat(src, "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]")
return
var/list/clusters = list("None"=CLUSTER_CHECK_NONE,"All"=CLUSTER_CHECK_ALL,"Sames"=CLUSTER_CHECK_SAMES,"Differents"=CLUSTER_CHECK_DIFFERENTS, \
@@ -181,7 +181,7 @@
var/theCluster = 0
if(moduleClusters != "None")
if(!clusters[moduleClusters])
src << "Invalid Cluster Flags"
to_chat(src, "Invalid Cluster Flags")
return
theCluster = clusters[moduleClusters]
else
@@ -192,10 +192,10 @@
M.clusterCheckFlags = theCluster
src << "Defining Region"
to_chat(src, "Defining Region")
N.defineRegion(Start, End)
src << "Region Defined"
src << "Generating Region"
to_chat(src, "Region Defined")
to_chat(src, "Generating Region")
N.generate()
src << "Generated Region"
to_chat(src, "Generated Region")