Commit Graph

336 Commits

Author SHA1 Message Date
arsserpentarium d35f3da470 [READY]Circuitry lab (#34493)
* spelling

* base

* maps

* merge

* firealarm

* floor

* floor again

* if you insist...

* DV

* DV(2)

* DV(3)

* fuck

* fuck

* apc

* boxapc
2018-01-16 17:44:26 -05:00
oranges 387e09c08f Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-17 09:36:15 +13:00
WJohn fec56e4923 Remakes the space syndicate listening post. (#34309)
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
2018-01-15 14:17:04 +01:00
ShizCalev cdb53fcbe9 Fails travis on common mapping mistakes 2018-01-11 13:36:06 -05:00
WJohn 28c42f6b03 Redesigns the syndicate lavaland base. (#33962)
* Redesigns the syndicate lavaland base.

* Adds a couple of lights to airlocks.

* Makes external walkway's area unsafe during ash storms.

* Changes areas to /unpowered

* Minor fixes to lightbulbs, bar sign access, and air alarms having 152 when they should have been 150.

* Changes pump to /on subtype and removes unecessary null inupt tags.

* Removes a ton of dirty vars.

* More cleanup.

* I think that's the last of them.

* Removes icon states that shiz requested.

* Moves RPD and adds an empty canister in atmos.
2017-12-31 18:57:15 -05:00
Tad Hardesty f2dbe5cf13 Replace explicit z-level checks with defines (#33829)
* Replace explicit z-level checks with defines

* Rename turf_z_is_planet for consistency

* Use TRUE/FALSE in onSyndieBase
2017-12-29 14:40:06 -05:00
Cruix ec48947d31 Made atoms not smooth with shuttles (#33807)
* Made atoms not smooth with shuttles

* Shuttle area canSmoothWithAreas is automatically assigned to the area's type if it is null

* Moved pirate shuttle areas into the multi-area shuttles section
2017-12-29 09:27:34 +13:00
Emmett Gaines 8fdf0c508f Arena shuttle teleport fix (#33777) 2017-12-25 20:11:40 -05:00
Fox-McCloud fda4b6be73 Xenobio Blueprints Change 2017-12-02 20:08:02 -05:00
ShizCalev 269f32d09f Refactor area list 2017-11-22 04:37:41 -05:00
ShizCalev 8eafaccc88 Cleans up unused code 2017-11-20 00:03:33 -05:00
vuonojenmustaturska 39375d5cc2 Replaces a bunch of mob loops with hopefully better ones (#32786)
* Free codebase churn

* fixes dviewmob

* a commit

* Partial revert "Free codebase churn"

This reverts commit 9dd41b3860c331637bbc85e694dd32dc59768ad5.

* better fix to dviewmob

* renames living_mob_list to alive_mob_list, adds mob_living_list and carbon_list

* make some use out of the shiny carbon list

* make some use out of the shiny new living list

* more things, also make the mobs subsystem (Life) use living list

* bonus

* domo arigato mr. roboto

* compile fixes, also made the drone code less dumb

* better?

* make admin message prettier

* honk

* fixes blobs

* rev fixes

* one small thing
2017-11-16 23:08:40 +01:00
vuonojenmustaturska 6a32f31a82 Greatly increases the performance of station-ending plasma fires (#32620)
* So pity us poor sailors, wherever we roam. For there's no guarantee that we'll ever come home

* All the engines were dead, and the life systems shot

* Should take care of borg cameras

* Fixes the issue with singulos and cameras, also fixes atmos and power alarts to be as performant as the fire alert

code also tested again

* rename area var to myarea to distinguish it from the type, fixes fire alarms and singulos

* Remove unnecessary iteration (webedit, test later)
2017-11-14 14:51:22 -05:00
Qustinnus a4bf7c72bc Adds ambience for Reebe. (#32623)
* spooky

* fix 1

* fix 2
2017-11-13 22:44:23 +13:00
Emmett Gaines 28e6359939 makes blueprints work on station and able to expand old areas (#32280)
🆑 ninjanomnom
add: You can now select a nearby area to expand when using a blueprint instead of making a new area.
add: New shuttle areas can be created using blueprints. This is currently not useful but will be used later for shuttle construction.
tweak: Blueprints can modify existing areas on station.
admin: Blueprint functionality has been added to the debug tab as a verb.
/🆑

Additionally the code for getting all turfs in a contained space has been refactored for some pretty good performance improvements.

Old proc: Self CPU 8.816, Total CPU: 10.009, Real Time: 10.009, Calls: 5000
New proc: Self CPU 4.174, Total CPU: 9.000, Real Time: 9.001, Calls: 5000

They've been moved into a area helpers file.
2017-11-13 22:32:36 +13:00
oranges ac8864b6e3 Merge pull request #31947 from AnturK/yarr
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 22:18:37 +13:00
Leo e157e689f9 Merge pull request #32525 from ShizCalev/delta-fixes
Fixes Station issues, updates Test Area debug verb
2017-11-09 13:36:35 -02:00
kevinz000 4edd802edf Weak references + Cameras now use them (#32504) 2017-11-09 00:48:03 -06:00
Emmett Gaines 322c32a01e fixes power_change being called on un-initialized machines (#32503) 2017-11-08 18:16:57 -06:00
ShizCalev f48333c63e Fixes map issues 2017-11-08 16:06:06 -05:00
AnturK cd1c4f9df9 Pirate Event 2017-11-04 17:33:45 +01:00
Qustinnus e1d82dd5b5 Adds around 30 new ambience sounds, and changes ambience code a little bit (#32334)
* adds the sound to the codebase

* Adds the code for ambience selection

* 150 hours

* changes to defines

* 150 hours x2

* more like 0 hours amirite

* Some fixes (like wrappers)

+ replaces syndicate with highsec define
+ removes some music vars
2017-11-03 16:40:25 -04:00
Emmett Gaines 800ff38c95 New ambience for ash storms (#32213)
song name?
2017-10-31 09:22:11 +13:00
Ashe Higgs 9404537a29 Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds (#31723)
* Cleans up clockcult code a little

* Another thing with servants_active

* Now it compiles
2017-10-28 11:36:00 +13:00
ShizCalev 1c52504d81 Makes luxurious emergency shuttle noteleport 2017-10-25 23:39:25 -05:00
WJohn 56c0f7aad2 Readds the boxstation whiteship as a ruin. (#31709)
* Adds box's whiteship back as a broken down relic.

* And accompanying files to make it work.

* Derp
2017-10-15 12:31:20 -04:00
kevinz000 8d647ff524 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes (#30570)
* this will end horribly

* s

* kek

* wew

* i dont know what an atomized pr is

* lets hope this doesnt blow up

* ok

* Update living.dm

* Update flightsuit.dm

* Update living.dm

* Update living.dm
2017-10-13 18:09:20 -06:00
Ashe Higgs 389db5e7f6 Stargazers are now station-restricted, and cogged APCs are now quiet (#31565)
* Clockwork power generator tweaks

* Includes a blob_allowed check
2017-10-12 17:32:08 -06:00
ShizCalev 477384ce78 Refactors away mission & space ruin area code (#31512) 2017-10-12 11:46:30 -06:00
Emmett Gaines 49438a65f8 Syndicate infiltrator update (#31410)
* Wjohn's new plastitanium walls

* Adds plastitanium windows and...

Makes the infiltrator multi-area to test for bugs
Fixes some smoothing issues
Moves all infiltrator shuttles to centcom and removes them from station maps.
2017-10-08 16:04:02 -05:00
oranges dc731c991d Merge pull request #31315 from tgstation/Cyberboss-patch-3
Removes shitty sleep from area/Entered
2017-10-06 11:42:44 +13:00
Firecage ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage 2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
Jordan Brown 56ef3ab5a4 Removes shitty sleep from area/Entered 2017-10-04 15:28:17 -04:00
ShizCalev 2b89790dcb Fixes morgue maintenance radstorm protection (#31253)
* Morgue maint area

* Fixed typo
2017-10-03 17:11:06 -05: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
vuonojenmustaturska 6e468720ab Fixes to more Initialize procs (#30641)
* batch 1

/mob/living/silicon/robot/syndicate
/obj/effect/decal/cleanable/blood/old
/obj/effect/decal/cleanable/blood/gibs
/obj/effect/decal/cleanable/blood/gibs/old
/obj/effect/decal/cleanable/ash
/obj/effect/decal/cleanable/ash/large
/obj/effect/decal/cleanable/greenglow
/obj/effect/decal/cleanable/vomit/old
/obj/effect/decal/cleanable/shreds
/obj/effect/decal/cleanable/oil
/obj/effect/decal/cleanable/crayon
/obj/effect/decal/cleanable
/obj/effect/temp_visual/point

* batch 2

/obj/effect/anomaly
/mob/living/carbon/monkey/punpun
/obj/item/queen_bee/bought
/mob/living/simple_animal/hostile/poison/bees
/mob/living/carbon/human
/area/ai_monitored
/area

* batch 3

/mob/living/simple_animal/hostile/blob/blobspore
/obj/item/spellbook
/mob/living/simple_animal/hostile/blob/blobbernaut
/mob/camera/blob
/obj/structure/noticeboard
/obj/structure/piano
/obj/item/clothing/head/helmet
/obj/item/gun/energy/laser/chameleon

* batch 4

/obj/machinery/airalarm
/obj/effect/decal/cleanable for reals
/obj/item/stack/rods
/obj/effect/decal/cleanable/crayon for reals
/obj/screen/parallax_layer
/obj/item/device/instrument
/obj/item/ore
/obj/item/coin

* batch 5, getting tgstation ready for halloween

/obj/machinery/meter/turf
/obj/machinery/capture_the_flag
/obj/effect/ctf/dead_barricade
/obj/structure/firepit
/obj/item/clothing/head/helmet/knight
/obj/structure/spacevine
/obj/effect/hallucination/simple/xeno
/obj/effect/hallucination/simple
/mob/living/simple_animal/shade/howling_ghost
/mob/living/simple_animal/hostile/retaliate/clown/insane
/obj/structure/bookcase
/mob/camera/aiEye/remote/base_construction
/obj/machinery/computer/camera_advanced/base_construction
/obj/item/device/wisp_lantern

* batch 6

/obj/item/device/warp_cube/red
/obj/item/device/shared_storage/red
/obj/item/melee/ghost_sword
/mob/living/simple_animal/hostile/mining_drone
/mob/living/brain
/obj/item/device/mmi/posibrain
/mob/living/carbon/human/interactive
/mob/living/carbon/human/interactive/angry
/mob/living/carbon/human/interactive/friendly
/mob/living/carbon/human/interactive/greytide
/mob/living/carbon/human/interactive/robust
/mob/living/carbon/monkey/angry
/mob/living/simple_animal/hostile/guardian/assassin
/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech
/mob/living/simple_animal/hostile/syndicate/mecha_pilot
/mob/living/simple_animal/hostile/mimic/crate
/mob/living/simple_animal/hostile/mimic/copy

* batch 7

/mob/living/simple_animal/hostile/megafauna/colossus
/mob/living/simple_animal/hostile/megafauna/bubblegum
/mob/living/simple_animal/hostile/asteroid/goldgrub
/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck
/mob/living/simple_animal/hostile/asteroid/hivelordbrood
/mob/living/simple_animal/hostile/statue
/mob/living/simple_animal/hostile/wizard
/obj/machinery/power/smes
2017-09-13 02:47:17 -04: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
pubby a3ee6652ae Fix CentCom issues (#30409) 2017-09-05 16:34:35 -05:00
Jordan Brown 728aefbd70 Adds DropLocation(). To generally be preferred to get_turf() (#29814)
Fixes #29802

Unlike get_turf()this will sensibly pick if loc can be safely used
2017-08-18 16:44:20 +12:00
Ian Turk d50b0c6e63 resolved conflicts 2017-08-16 13:11:21 -06:00
ShizCalev 0e8fa79065 Everything from before but less merge conflicty (#29905) 2017-08-16 15:17:10 -04:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Jordan Brown d1ae0a0c95 Adds helpers to avoid << use (#29611) 2017-08-09 00:27:54 -03:00
Jordan Brown e1ac655438 Merge pull request #29750 2017-08-08 09:59:11 -04:00
Jordan Brown 16592d8472 Merge pull request #29768 2017-08-08 09:58:56 -04:00
shizcalev 22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
shizcalev a02bb7b96a Shit shit 2017-08-07 03:14:23 -04:00