Commit Graph

55 Commits

Author SHA1 Message Date
ShizCalev
269f32d09f Refactor area list 2017-11-22 04:37:41 -05:00
swindly
d3df913402 fixes spelling and stuff (#32531) 2017-11-09 11:03:50 -06:00
Emmett Gaines
800ff38c95 New ambience for ash storms (#32213)
song name?
2017-10-31 09:22:11 +13:00
Jordan Brown
4178c209f1 Configuration datum refactor (#30763)
* Configuration datum refactor

* More WIP

* New easier on the eyes format

* More WIP

* Finished config.txt

* Fucktons more WIP

* The end of conversion draws near...

* Add all this shit

* Done converting entries finally

* Hunting down compile errors

* More WIP

* MORE CONVERSIONS

* More WIP

* More WIP

* Oh shit only 90 errors this time!

* IT COMPILES!!!

* Fixes world start runtimes
2017-09-29 15:36:51 +13:00
Ashe Higgs
b7e7779c19 (Ready) Clockwork Cult Rework: Proof-of-concept (#29741)
* Starting on the rework

* Reworks the Ark

* Work on Reebe

* More Ark stuff

* this too

* Removes ark silliness, remaps Reebe a tad

* Spawning mechanics

* Work on gamemode code

* Finishes up ark stuff

* Removes Judgement, and lots of other changes

* New Ark activation sounds, Ratvar text

* Spawn protection!

* Adds the abscondence bijou

* Bijou stuff

* well, this is it

* somewhat absentminded coder

* Remaps the Reebe z

* replica fabricators now work!

* Guide paper!

* Now they're clockwork floors

* Infirmary, tweaks, numbers

* A new thing!

* this is ok for now

* I was gonna whine but it's actually necessary

* Adds damage scaling to ocular wardens

* I missed a thing

* you can go back too

* New clockwork armor sprites

* Weapons, scripture, oh my!

* no! shoo!

* hey, I forgot about you!

* this looks much better, I'll give you that

* no teleporting into the void!

* we have no need of you anymore

* Conflicteroos

* AUTOMATIC SPINNING CHAIRS

* how many times do we have to teach you this LESSON OLD MAN

* flagged!

* last time, meesa promise

* Conflicts 1

* wood filling

* Kindle is a projectile, and other stuff

* Chameleon jumpsuit, some small changes

* 150 hours of testing

* Curious is the trapmaker's art

* Conflicts 1

* naaah

* Fixes an ark sound

* Removes the prolonging prism

* Adds a delay to warping in

* First steps towards changing the power system

* Removes power from sigils, moves to global

* Conflicts 1

* zoom zoom

* Adds the stargazer, re-adds conversion

* conflicts? more like CLOCK-flicts

* get it? clockflicts?

* Daemon tuning

* Scraps components, 1/?

* A grace period, among other things

* You can't get to reebe from space no stop bad

* Adds some cogscarab shells to Reebe - yes, I get the sounds

* FUCK

* Chairs are very important.

* Clock golems, sound improvement, intercoms

* Sounds, floor fixes, conflicts

* Fixes the conflicts

* Prevents intercom use during non-clock rounds

* Wiki, HUD timer, tweaks, golems

* Components, removes unused structures, rep. fab power

* go-time

* Ending the round is not a good idea

* whoops, forgot about you

* ssh is ok

* this works too
2017-09-27 09:21:26 +13:00
KorPhaeron
10a3238fd6 Makes the station Z level into a list instead of a single define (#30297)
* Makes Station Z Levels a global list

* Things didnt get committed

* Define

* Removes files

* Fix mind.dm

* Wrong list name

* (

* Fixes rev checks and signpost

* Makes it actually compile

* Signpost fix

* I hate these sign posts

* Never use the web editor
2017-09-11 13:39:52 -04:00
Joan Lung
407e0e77e4 Ruin placement will try very hard to place any ruins with negative costs before attempting any other ruins (#28973)
* Ruin placement will try very hard to place all 0-cost ruins before placing any ruins with actual costs

* comment

* account for ruin variants properly please

* cost has a cost of 5

* tweak
2017-07-02 22:57:32 -04:00
Leo
6eec4d68e1 Merge pull request #28674 from Cyberboss/Cyberboss-patch-1
Fixes an error message
2017-06-22 13:02:36 -03:00
Jordan Brown
20e8a91581 Fixes an error message 2017-06-21 10:26:21 -04:00
Jordan Brown
59a3865f60 Merge pull request #28600 from ChangelingRain/hiddenripley
Adds a heavily-damaged ripley as a lavaland ruin
2017-06-20 13:08:48 -04:00
AnturK
868d374fab Moves transit space to separate z level. (#28598)
* Transt Z-level

* Just in case

* Map edit

* I guess i forgot to push the few lines i changed at work.

* This one too

* Bluh
2017-06-20 11:31:32 -04:00
Joan Lung
0fd7b8b842 Adds a heavily-damaged ripley as a ruin 2017-06-19 12:28:29 -04:00
Jordie
f042d97448 Adds round table to replace tacking some data in feedback table (#27454)
* adds round table to replace tacking some data in feedback table

* removes obsolete code for acolytes_survived

* uses a better query

* corrects var name

* uses actual sql queries

* adds commit column and connected checks before queries
2017-05-26 22:17:44 +02:00
Joan Lung
449fb93545 Megafauna and lavaland mobs will no longer spawn directly on top of the mining base (#27476) 2017-05-21 22:10:32 -03:00
Leo
f263c4884a Merge pull request #26521 from AnturK/template-turret-control
Fixes templates/ruins not updating area list
2017-04-27 19:02:09 -03:00
Leo
c2d5bd2a6f Merge pull request #26548 from Cyberboss/patch-56
Fixes map rotation with disabled voting
2017-04-27 11:20:02 -03:00
Cyberboss
729010bbb2 Unorphans the blackbox (#26129)
Moved sql_poll_population from server_maint to this new SS. Moved few remaining server_maint tasks to SSping and deleted it.
2017-04-27 10:04:57 +12:00
Cyberboss
01efacfe4c Fixes map rotation with disabled voting 2017-04-24 23:33:53 -04:00
AnturK
ff4596a6ba Fixes templates/ruins not updating area list 2017-04-24 10:47:45 +02:00
Jack Edge
a76d4374c1 Moves init_order to defines, moves SSevents above ticker. 2017-04-22 22:08:31 +01:00
Cyberboss
9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
Cyberboss
5646c736c8 Merge upstream 2017-03-30 19:18:59 -04:00
Cyberboss
ef5ac7dcc7 Adds feedback for the map a round was played on (#25593) 2017-03-30 08:37:02 -03:00
Cyberboss
2fd142959a Merge upstream 2017-03-28 18:52:59 -04:00
Cyberboss
7ad4aa7a19 Improve SStitle. No delay icon loading (#25541) 2017-03-28 15:40:37 -03:00
Cyberboss
fb596bcdb3 _DEF 2017-03-22 14:52:21 -04:00
Cyberboss
7e14ec75fc Normalizes subsystem definitions 2017-03-22 11:50:46 -04:00
Cyberboss
8023a02e57 Map loader optimizations (#25316)
* Cut out an unecessary locate call

* Remove an unecessary var

* Add an appropriate warning

* Move the CHECK_TICK to a more sensible place

* Change the default turf to /turf/open/space/basic

* Skip loading default turfs

* No need for CreateSpace anymore

* Improve the comment
2017-03-22 22:10:00 +13:00
Cyberboss
0bb7407503 Adds a configuration option for disabling preferred maps (#25137)
* Adds a config option to disable map voting
2017-03-17 12:50:26 -03:00
Cyberboss
b5d944967b Revert "Fixes badness caused by reverting the map optimization" (#24976)
* Revert "Fixes badness caused by reverting the map optimization"

* Updated

* Remove the shitty warning
2017-03-13 14:55:00 +13:00
Jordie
619c8f2d97 Merge pull request #24755 from Cyberboss/TheFuture
Ticking the map dm's will force that map to load
2017-03-11 20:58:16 +11:00
oranges
536af36ef5 Merge pull request #24955 from Cyberboss/patch-24
Fixes badness caused by reverting the map optimization
2017-03-11 16:38:45 +13:00
Cyberboss
b88b2c5e82 Adds time display for map loading (#24835)
* Adds time display for map loading

* Bluh
2017-03-10 23:21:18 +01:00
Cyberboss
aed01f7ef4 Fixes badness by reverting the map optimization 2017-03-10 17:18:08 -05:00
Lzimann
3dd6722c07 Fix conflict 2017-03-10 01:39:22 -03:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Cyberboss
a0df4444eb Revert the map loader optimization
Reverts #24764
2017-03-10 00:12:00 -03:00
Cyberboss
272cc34008 Compiles in Lavaland (#24791)
* Compiles in Lavaland

* Move this into a more appropriate folder

* Lowercase L

* Take this opportunity

* To actually capitalize the damn thing

* Now fix the shit
2017-03-10 09:44:48 +13:00
Cyberboss
645f3b1d75 Cuts out a chunk of map loader time for maps with a lot of space (#24764)
* SPACE OPTIMIZATION

* Don't need this instancing anymore either

* Forgot to drop this

* FASTER!!!!

* FASTER!!!!!!!!!

* Move this back, it makes no difference

* Fix a potential bug

* FAAAAAAASSSSSSTTTTTTTTERRRRRR!!!!

* open

* Ye be warned

* Better diagnostics + fixes

* Fewer false positives

* Bleh

* Remove the unecessary z-expansions
2017-03-09 11:24:51 +13:00
Cyberboss
31ee152489 Repaths subsystem to controller/subsystem (#24624)
* Repaths subsystem to controller/subsystem

* Fix the shit
2017-03-08 22:05:45 +01:00
Cyberboss
d9e060a6ae Fixes map rotation message showing same map (#24756) 2017-03-07 23:21:15 +01:00
Joan Lung
f36940d1c0 Circuit tiles now glow faintly (#24722)
* Circuit tiles now glow faintly

* one missed
2017-03-07 21:04:04 +01:00
Cyberboss
2ff5e1aaf8 Ticking the map dm's will force that map to load 2017-03-06 18:01:49 -05:00
Cyberboss
1bbc640afe Runtime Dynamic Station Loading (#24171)
* Dynamic map loading prototype

* Get the title screen working

* Fixes the random pod bugs

* map configs

* Add back the asteroid

* Ignore the rotate file

* Fix some shit

* More shit fixes

* Babby's first json

* Cyberboss confirmed shitcoder

* Makes map rotation great again

* Moves the map defines

* Delete tgstation2.dm

* Convert runtimestation

* Convert PubbyStation

* Convert OmegaStation

* Convert Metastation

* Convert Delta Station

* Lol file extensions

* Reee line endings

* Take out the trash

* Fix loadallmaps.dm

* Deltaassssssstation?

* Fix travis

* Did I ASK you to change the line endings?

* Remove votable maps

* Cleanup

* Previous config. Load configs in New. Fix splash

* Fix this

* More generic minetype

* STOP TOUCHING THE LINE ENDINGS!!!

* Add some flexibility to /obj/screen/splash

* Fix the shit

* Update gitignore

* Smooth transition from last map

* Better check

* Missed this map rotate check

* Remove these checks too

* Prep for a future request by @kevinz000

* Fix z2 line endings

* Solution for custom .dms

* Rename some things, trim some fat

* Fixes default map_config

* Remove stale comment

* Delete the previous config after loading

* Don't try to open a non-existent file

* Delete the old rotator script

* And references to it

* Line endings

* More line endings

* Del checks from when m-config may have not existed

* LINE ENDINGS

* Update the default map config

* Map load error checking for what it's worth

* Small cleanup

* For case sensitive

* File systems

* Strip maprotate stuff from build script

* Spruce up the _maps tree. Compile some empty space

* Make travis simpler

* LINEARU ENDARU!!!

* tgstation TWO!!!

* Lowercase mine type

* Dummy dm's for testmerging

* Fixes job ordering

* If ghosts wanna watch the map load so be it

* Let them know what's going on

* Fixes z-transitions

* Optimize z expansion further

* Remove this old var

* Fix wiznerd teleportation

* Rmove butt

* Does the thing

* Moved temp configs to the data dir

* Un-touch gitignore

* Forgot templates.dm

* Forgot to include the includer

* Fair enough

* SILENCE IMBECILE!

* @Cyberboss still a fuckboi

* Speed things up a bit

* Fix a potential bug with the error message

* Whatever
2017-03-07 10:45:31 +13:00
Cyberboss
3ad9be1555 Subsystems are now ordered by name in MC tab 2017-03-02 14:45:40 -05:00
Cyberboss
1365ab99d8 Merges map templates and map loader (#24140)
* Reorganize the mapping code

* Finish this up

* Reee line endings

* FUCKING LINE ENDINGS

* LINARU ENDARU

* >PLS SET REPO LINE ENDINGS

* Comments

* Hoisted by my own travis.yml changes
2017-02-19 16:55:02 +13:00
Cyberboss
cebaa7061c Removes the mining asteroid (#24173) 2017-02-17 10:49:48 -06:00
Cyberboss
17bc8038f1 Roundstart no longer delayed by initializations 2017-02-14 23:47:01 -05:00
oranges
1b29dd9306 Merge pull request #23730 from Cyberboss/patch-13
Moves SSjob initialization to first
2017-02-06 18:25:00 +13:00
Cyberboss
b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00