Commit Graph

259 Commits

Author SHA1 Message Date
Cyberboss
2f90da2127 HEAVY FUCKING BREATHING (#23935) 2017-02-10 12:14:43 -06:00
oranges
5798ce24fe Merge pull request #23865 from Cyberboss/patch-6
Fixes Testmerge list duplication
2017-02-10 20:30:31 +13:00
Cyberboss
8e1351a06f Faster, non-blocking world init (#23136)
* Moves turf New calls to Initialize

* Much faster

* Fixed

* Makes add_to_active queue up before SSair is initialized

* Remove active queuing

* And the proc

* Move the check

* Fix some shit

* F U C K T U R F S

* Necessary

* Unnecessary

* SHUT THE FUCK UP

* Panic mode hurts the code

* Such a

* Simple answer

* A well thought out plan

* /turf/open optimization

* Undo the warning suppression now that it's fixed

* Fixes lava typecaching badly

* Added late initialization

* Make the atmos offenders late initialize

* Add extra logging

* GLABALS

* Better solution for trying to activate w/o air

* Further base calling copypasta

* Gates, guards, gorans

* Small doc fix

* Do the faster

* T U R F   V A R   P E R S I S T E N C E

* The solution is always so simple

* The (hopefully) final nail in the coffin
2017-02-10 16:53:08 +13:00
Cyberboss
8baa487275 Fixes Testmerge list duplication 2017-02-08 13:24:17 -05:00
oranges
773ac59ff8 Merge pull request #23514 from AnturK/mixedlisttypesneveragain
Fixes game mode odds (again)
2017-02-01 15:55:07 +13:00
Cyberboss
a4d5579f79 Initialize Safety Cleanup (#23274)
* Better `in world` Initialization handling

Remove spawn_atom_to_world and SSobj.atom_spawners

Roll SSobj/setup_template_objects and SSobj/Initialize into new generic proc

* >BYOND

* >var names

* Defines

* Actually remove the spawn_atom_to_world definition

* A note on NOT CALLING THE BASE

* Remove set waitfor = 0

* My comments are cool

* In order to prevent just that...
2017-02-01 15:48:17 +13:00
AnturK
d816623aeb Fixes game mode odds 2017-01-30 22:27:36 +01:00
Cyberboss
f7c9749ca0 Fixes some bad addtimer calls. Adds INVOKE_ASYNC. Replaces addtimer(..., 0) (#23424)
* Fixes some bad addtimers

* Adds INVOKE

* Warning for addtimer

* Working syntax

* Another bad call

* Fixes the addtimer warning

* Add suppress_zero_warning to addtimer

Useful for addtimer that uses vars

* Add INVOKE_AGAIN for when the var is already defined

* Replace addtimer(...,0) with INVOKE((...))

* Much more sensible syntax

* Less overhead, less copypaste

* Rename INVOKE_ASYNC

* Use a macro

* Allman style

* Wait, why make it a datum in the first place?

* Revert the rename

* Rename again, keep line endings

* typo

* More typos

* Untouches Addtimer

* Update callbacks.dm

* Update timer.dm

* Revert allman style

* Revert "Revert allman style"

This reverts commit 47361da15bd04eca138be5f13acdc9dd5ba89331.

* Trying to match that whitespace diff

* Why is this missing?

* I'm not fucking dealing with this!
2017-01-31 09:20:54 +13:00
AnturK
12978dd350 Fixes show-rev gamemode odds (#23304) 2017-01-25 09:51:19 -06:00
AnturK
78f418c33b More useful roundtype odds, take two. (#22542)
* More useful roundtype odds, take two.

* Loopdate
2017-01-21 18:56:09 -05:00
Cyberboss
4fc79dbb95 Refactor events to use callbacks 2017-01-06 20:35:00 -05:00
Kyle Spier-Swenson
bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00
AnturK
d818a33a6a Makes gamemode odds show % at current population (#22437)
* Makes gamemode odds show the % at current population

* Improvmets, probably broken
2016-12-28 09:04:17 +13:00
Cheridan
89d3752276 Merge pull request #21584 from RemieRichards/swarmer_boss
Adds a new boss: Swarmer Swarm [Now a Ruin]
2016-12-01 07:47:54 -06:00
oranges
c2295b8f21 Merge pull request #21841 from MrStonedOne/sadface
Fixes some shit that was annoying me about configs.
2016-12-01 12:12:59 +13:00
MrStonedOne
62177b2734 Fixes some shit that was annoying me about configs.
Code files are less of an issue, but I have to ferry the config across linux and windows, and I don't want to have to care about the case of shit on the linux side.
2016-11-28 21:49:45 -08:00
Remie Richards
c2d9c849b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into swarmer_boss
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
2016-11-25 17:14:20 +00:00
Cyberboss
e37f807941 Fixes the false armblade removal timer. Refactors addtimer (#21714)
* Clever girl...

* Make the addtimer unique param safe

* Refactor addtimer calls

* Moved the location of the define so the other SSs can use it
2016-11-25 22:05:58 +13:00
Leo
cc0071e720 Adds a config file to enable/disable shuttles from being bought (#21642)
* Adds a config file to enable/disable shuttles from being bought

* Remove useless comment
2016-11-22 11:53:51 +13:00
Remie Richards
0a74ca8b41 Feedback Round 1:
- Two new Swarmer classes, Melee and Ranged Combat Swarmers
- The Swarmer cap is now 60
- The Swarmer Beacon will replenish swarmer numbers up to 50% of the total swarmer cap (up from 20% of it)
- Fixed the Swarmer beacon chasing and nuzzling people
2016-11-17 23:14:11 +00:00
Joan Lung
bdcb16113a Adds a few turf istype helpers (#20754)
* a very calming act
when the world is too much, too fast

* i'm tired
but i have to be efficient, infinite

* lick your lips at the sight of me
a fantasy made reality
2016-10-01 19:25:46 +02:00
Joan Lung
dff4db726a Replaces a bunch of istypes with their proper macros (#20739)
* Replaces a bunch of istypes with their proper macros

* i'm not sure doing a 100+ file changed pr on a whim is something you do when bored
especially if you do it by hand because you never actually learned the regex that would let you automate it

* i'm just... gonna do this, because that check was true a lot and it shouldn't matter
2016-09-30 20:21:08 +02:00
Jordie0608
7a97ac7bdc getrev wrong var patch 2016-09-27 19:01:14 +10:00
nullbear
24abd55594 Makes it so you cant teleport into transition edges. (#20427)
Also adds a helper proc for checking whether or not an atom is in the
transition edges of the map.
2016-09-13 09:09:00 +12:00
Jordie
e27fccb3c7 fixes newline match 2016-08-29 21:22:26 +10:00
Jordie0608
cda1f7939d fixes regex commit? 2016-08-26 15:46:39 +10:00
Jack Edge
df9bd80c03 More spawn() removal and timers and stuff 2016-06-25 11:55:21 +01:00
oranges
0432cd9bb4 Merge pull request #18484 from coiax/random-space
All of space is now randomised
2016-06-23 09:12:48 +12:00
Sawu
9463880ed8 Renames the initTemplateZLevel function to initTemplateBounds 2016-06-22 22:56:07 +10:00
Sawu
1bfca19bf9 Update/fix
* Chapel is now loaded upon a pope spawning, as it's own Z-level
* ZLevel init for template loading separated into it's own function.
* Including missing sprites for the Hades Acolyte.
2016-06-22 22:37:38 +10:00
Jack Edge
9783a08454 find_safe_turf more random, more cycles
It doesn't look in a vaguely central location anymore, and makes more
attempts to compensate.
2016-06-16 12:29:16 +01:00
nullbear
98ee507de8 Adds noteleport variable
This is mostly a pre-setup for my greater-bag-of-holding stuff.

You can't use bluespace crystals/jaunters/hand teleporters to access bluespace-proofed areas. at the moment, this only applies to shuttles and centcomm.

Teleport beacons placed in bluespace proofed rooms can't be teleported to, except via teleporter station hub.

A little concerned because now 'hijack' antags cant use teleprods to fling everyone out of the shuttle while in transit. q_q could easily just make the shuttle non-bluespace proof though.

Note for mappers: This means you can create ruins that can't be teleported into using bspace crystals by setting the area "noteleport" to 1. This can be used to force players to travel through the ruin the way they're intended to. Or to prevent them from gaining access to areas they shouldnt normally be able to. (ie. the wishgranter ruin)
2016-06-09 20:33:25 +12:00
Jack Edge
a9b43f06bf Bluespace shelters use templates
🆑 coiax
rscdel: Bluespace shelter capsules can no longer be used on shuttles.
rscadd: Bluespace shelters may have different capsules stored. View what
your capsule has inside by examining it.
/🆑
2016-06-07 02:11:35 +01:00
coiax
4483d5275c Shuttle manipulator (#17436)
* Starting out on our tgui journey

* God tgui, why do you need to be updated

You're dynamically generated anyway

* Commit of stuff

* Further progress is being made

* Everyone loves buildscripts

* Further modifications to my incredible running script

* Starting to modify the minimap code to be better

* It's going well thusfar, I guess

* What have I done

* RIP minimap

* FUN FUN FUN FUN FUN

* Adds shuttle_manipulator.dmi

MUH HOLOGRAMS

* Is it done? IS IT OVER

* Peer review

* Some bug fixes

* Makes that damn greentext shut up

* Shuttle registration

* Made the Emergency Escape Bar more robust

No climbing on the bar.

* Do not stare into the operation end of the device

* Compile shame

* THE MOST DUMB

* Passive barmaiden

* Emergency shuttle memes

* MORE SAFETY CODE

* Fancy shuttle manipulator icons

* Smoothing it out

* We are going to have a lot of fun with this one

* Independent blobbernauts

* WABBAJACK WABBAJACK

* Message for attempting to authenticate old style

* Angry alert noise is back

* Revert "Independent blobbernauts"

This reverts commit 34d6af7c9c88cfc2864990cb37b586bb90163dd3.

* No parrot sleep plz

* Moves the special shuttle stuff to special.dm

* No Bartender like a Centcom Bartender

* Non-controversial map changes

- Backup shuttle moved closer to Centcom main structure, docking tube
created
- Moved shuttle import landmark to above Centcom main building
- Added shuttle displays to Conference Room
- Squashed the Chapel a bit in Metastation
- Made the docking port on Z2 massive
- Made the docking port on Metastation a lot larger

* Hacks and slashes at Box

A bunch of things are extended and squashed so Box shuttle dock can
support the MetaStation emergency shuttle.

* Some Metastationshit

* Never ending changes

* Wabbajack to TGM

* Modified the bar, I think that's all of them

* Stops Barmaiden wandering around

* More code review

* Whitspace, the bane of us all

* DIE WHITESPACE DIE
2016-05-26 15:15:19 +02:00
coiax
57f22f8375 Swarmer teleport refactored; handcuff message fix (#17913)
Fixes #17912.

🆑
bugfix: Fixes a bug where swarmers teleporting humans would incorrect
display a visible message about restraints breaking.
/🆑

- Added a find_safe_turf() global proc in teleport.dm
- Also rewrote it to involve less awful indent chains
- Removed a trailing return for Remie
2016-05-25 23:06:44 +02:00
coiax
035334589d Ruin budget system (#17366)
* Initial start of lavaland ruin budget system

Weights are dumb, we're gonna use BUDGETS!

To be clear, each round, there will be a budget for ruins.

HERE IS A ROUGH APPROXIMATION OF THE AIMED PROCESS
 - Pick a ruin
 - Can we afford it? If not, start again.
 - Try a bunch of times to place it.
 - Did we place it? Good, then reduce our budget accordingly

Does this look a little like syndicate surplus crates? That's the point.

* Subclassery

* Budget based ruin loader is GO

* Cryostasis (with a s)

* Adjusted costs, added no-duplication

* No dupes on the major ruins

* Deleted files, budget is config

* Corrected description

* Fixed ruins failing to load, duplication

* The zoo goldgrub will no longer burrow away

* Space descriptions and names

* No more weird Xenonest loops, should be all good

* Adjusted costs based on feedback
2016-05-08 23:03:42 +10:00
coiax
5b5d956943 Alternate escape shuttles and ferries (#16761)
* Added a simple bar-theme escape shuttle

Features include a very tough Bardrone, with laws to be a good
bartender, bathroom, a quality lounge for the heads, and a small
gambling table.

* Changed drone's health to 3000

Bardrone is now strong, to cope from stray gunfire.

* Replaces banned variables with alternates

Step_[xy] is bad, mkay?

* Added STV5, the cramped transport shuttle

Well, looks like Centcom only had this ship ready for evacuation. I hope
you're friendly with your coworkers!

* Removed shuttle area from empty space on STV5

* Added cult shuttle

Looks like this automated shuttle may have wandered into the darkness
between the stars on route to the station. Let's not think too hard
about where all the bodies came from.

* Include the Narnar Shuttle

* Meat ferry added

Very basic, could probably use some love from a map wizard.

* Moved shuttle files to shuttles/ directory

* MAPS MOVED AND RENAMED

* Hyperfractal Gigashuttle

"I dunno, this seems kinda needlessly complicated."
"This shuttle has very a very high safety record, according to Centcom
Officer Cadet Yins."
"Are you sure?"
"Yes, it has a safety record of N-A-N, which is apparently larger than
100%."

* I REGRET ADDING THESE

* Into templates you go

* Changed floors

* Hugbox supermatter, for map making

* Shuttles KINDA delete themselves

* Hats in hats in hats in hats in hats

* Use the hugbox supermatter in the shuttle

* Include the new verbs

* Include our new verbs

* Fixed runtime when deleting emergency shuttle

* Added to verb list

* Fixes more runtimes with deleting the shuttle

* Shuttle Destroy verb now functions

* Moved them out of the shuttles/ folder

* We'll need these docks later

* shuttle_import landmark datum made

* Changes z2 to TGM format and adds shuttle_import landmark

* SHUTTLE IMPORT VERB

Is this it? Are we there?

* Some compile fixes

* Emergency bar map updated

* Updated cramped shuttle

* Updated narnar shuttle

* Supermatter shuttle updated

* Meat ferry updated

* Debugging information included

* Debug code, QDEL hints

* Minor updates to collection of maps

* May as well use the snowflake drone code

PICK YOUR OWN BARKEEPING HAT.

* The Lighthouse

*static*... part of a much larger vessel, possibly military in origin.
The weapon markings aren't anything we've seen ... *static* ... by
almost never the same person twice, possible use of unknown storage ...
*static* ... seeing ERT officers onboard, but no missions are on file
for ... *static* ... *static* ... *annoying jingle* ... only at The
LIGHTHOUSE! Fulfilling needs you didn't even know you had. We've got
EVERYTHING, and something else!

* Made supermatter hallucination too powerful

* Added force argument for docking testing

* Added emergency backup shuttle

Hopefully it will never be seen or used. But means that provided it's
there and untouched, even with the accidental deletion of a shuttle,
round will still be able to end as normal.

* Added templates for existing shuttles

* Backup shuttle used if emergency shuttle deleted

* Added backup shuttle transit space

Don't know why transit spaces aren't dynamically generated, to be
honest.

* Hyperfractal Gigashuttle improved

More radiation lockers, chairs which makes it "safer".

* Added Shuttle Under Construction

The documentation hasn't been finished yet for this shuttle. Break glass
in case of emergency.

* Added warnings for shuttle interaction

ARE YOU SURE YOU WANT TO DELETE THE EMERGENCY SHUTTLE?

I mean, I really don't know what will happen, and it's probably
nothing good.

* Snappop(tm)!

Hey kids and grownups! Are you bored of DULL and TEDIOUS shuttle
journeys after you're evacuating for probably BORING reasons. Well then
order the Snappop today! We've got fun activities for everyone, an all
access cockpit, and no boring security brig! Boo! Play dress up with
your friends! Collect all the bedsheets before your neighbour does so!
Check if the AI is watching you with our patent pending "Peeping Tom AI
Multitool Detector" or PEEEEEETUR for short. Have a fun ride!

* Fixed horrific experiment icon, added gambling spawner

* Candle changes

Infinite candles start fires but don't run out.
Infinite candles don't make messages when created.

* Shuttle can dock if already docked

* Fixing bugs with shuttle import

Also, some minor bugs with hugbox supermatter still consuming
gas moles and slowly depressurising the area.

* Admin notice, unload bad template

* Fixes problems with some shuttles

* Warning message if roundstart dock failed

* Compiles.

* Inform admins of shuttle problems

* Names for shuttles, minor tweaks

* Moved shuttle templates to shuttles/

* Version numbers are lame

* Shuttle datums

* Shuttle manipulator barebones

It doesn't do anything at the moment.

* Added shuttle manipulator to Z2

It still doesn't do anything yet, but it looks pretty.

* Use GetAllContents(), don't delete ghosts

* Fixes bug where nothing would actually load

* Cancel button on Destroy Shuttle

* Fixed birdboat shuttle overwriting bar shuttle
2016-05-07 23:35:57 +02:00
YotaXP
2072670afd Clean up magic numbers. 2016-04-18 18:28:44 -04:00
YotaXP
0d8cc8aee7 Make the loader use ChangeTurf() for turfs. 2016-04-18 17:41:05 -04:00
YotaXP
03d38bf895 Adds a 'measureOnly' mode to the maploader code for templates. 2016-04-18 16:04:35 -04:00
Incoming
6ec39db02a Ruins are now unique, you won't find two of the same one in the same round.
The configurable portion of ruin selection is now a blacklist instead of a whitelist.

Moves Lavaland files to be consistent with Space files.

All ruins are now valid for the sake of template generation (previously lava ones were but space ones weren't.
2016-04-12 17:13:41 -04:00
Joan Lung
c477cc764c Merge pull request #16108 from Jordie0608/thereareseveralwaysthiscouldbreakbutfortunatelynoneofthemwouldbemyfault
Show-server-revision supports multiple test merges
2016-03-17 17:47:18 -04:00
Jordie0608
5115e3e7e0 adds support for multiple test merges 2016-03-14 16:17:19 +11:00
duncathan salt
1692d5a01d Merge pull request #16022 from AnturK/ruin_fix
Fixes ruins repeating
2016-03-12 13:50:12 -06:00
Jordie0608
c3f28bb395 show-server-revision tells if test pr is merged 2016-03-11 20:35:10 +11:00
AnturK
9531ff401a Fixes ruins repeating 2016-03-10 18:13:49 +01:00
AnturK
07432da284 Fixes off-by-one errors.
Adds template area preview
2016-02-22 19:09:31 +01:00
phil235
fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
2016-02-06 15:42:13 +01:00
Bjorn Neergaard
063dd9fb84 Get the code running on 510
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
phil235
8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
2016-02-04 14:34:45 +01:00