Commit Graph

2326 Commits

Author SHA1 Message Date
Qustinnus
b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00
oranges
28f0a5a890 Merge pull request #45236 from Rohesie/fps
world.fps and SStimers safety check
2019-07-22 21:07:55 +12:00
MadoFrog
11046c5267 Fixes custom title screens and adds custom directories to .gitignore (#45181)
* Updated .gitignore

Now git doesn't look at custom music or images

* Custom titles now work again
2019-07-18 17:09:24 +02:00
Dennok
1b165b26d1 Bluespace Navigation Gigabeacon (#44807)
About The Pull Request

This PR add "Bluespace Navigation Gigabeacon" that shuttles can use as a target for the jump computer.

You can customize locked status by multitool or name of beacons by multitool with unscrewed beacon.
If you, or emp, lock beacon you are still able see it in choice list like a "Locked" destination, but unable to jump to it.
Why It's Good For The Game

Now any spacemen can construct their own Space station on any Z lvl (that not reserved, centcom, away mission) and dock (by custom dock) his ship to it.

Now we actially have some shuttles that have ability to place custom dock.
That one is whiteship, but only if its not UFO, 4 ships in caravan ambush(for 2 need sindycate access), +1 for nuclear ops(sindycate access), but dont forgot that Admins can spawn "navigation computer" to any shuttle.).

Lavaland safari likers now can land anywhere where they can fit a ship, on lava, basalt, and plating turfs, also asteroid.

I drop some bombs to clear spot and land to lavaland.
http://recordit.co/qN10qfuift

Here i create dry dock near station and dock ship into it.
http://recordit.co/R4kXqN8rnt

all walls and other floors are forbidden to prevent you landing on the station

possibly more random gibberish?)
maybe change plating to reinforced (engine) floor.

Navigation computer now use trait blacklist to filter out z levels to where it can't place custom dock.
This make easy to add new z lvls where it can place dock.
2019-07-17 13:58:57 -04:00
L
a03b33be2e world.fps 2019-07-17 10:31:08 -03:00
Emmett Gaines
c25459d938 Adds SHOULD_CALL_PARENT to Destroy() (#45188)
Timers, signals, and components need to know when the thing they're 
attached to is getting destroyed or bad things happen. Since any datum 
can make use of these every destroy needs to call parent.
2019-07-15 18:13:48 -07:00
ShizCalev
604061f7e9 Merge pull request #44889 from Dennok/shuttle_manipulator-load-fix
shuttle_manipulator load fix
2019-07-12 23:55:46 -04:00
vuonojenmustaturska
349ad4aefc Fixes experimentally cobbisected techwebs, and prevents it from happening again (#45096)
* fix techwebs

* proper fix
2019-07-10 16:07:56 -04:00
Jordie
81012a923a Merge pull request #45049 from AnturK/policyscreaming
Supresses policy file runtime but messages admins about it.
2019-07-10 22:23:55 +10:00
Time-Green
ceeff661a0 [READY] Plumbing (#44833)
cl Time-Green
add: Adds plumbing pipes and some hidden plumbing related machines. They're not available in-game yet.
sprites: Geyser and geyser pump sprites created by Mey-Ha-Zah!
/cl
Adds the following objects:

    Fluid ducts . Like atmos pipe, but for reagents. They're smart and can be seperated by layer and color

    Geysers. They spawn on lavaland and can be harvested with liquid pumps or just beakers.

    Liquid pumps. For pumping geysers. They need to be on a wire node and connected to a duct network.

    Plumbable reagent dispenser subtype.

    New plumbing RPD specific RPD.

    Plungers. The reinforced plunger can be used for plunging geysers to activate them. They currently serve no other function and can't be worn as a hat yet.

They're all disabled and admin only.

Adds the following systems:

    Ductnet datum. They pretty much say "hey, we're connected"

    Plumbing component. You can turn any movable atom into a plumbable thing. Comes with overlays and everything. They're essential for everything that has input and outputs, except pipes. That means you can have machines connected to both atmospheric pipes and fluid ducts. They only connect with layer 3 ducts.

    Fluid subsystem that handles the processing on the plumbing machinery and other plumbing related stuff.

Basically atmospherics but with reagents. Reagents are pressurized and thus transferred instantly, to avoid those stupid leftovers in pipes no one likes. I am PRing it now because if I were to add a dozen or so associated machines, it would be too much of a pain to manage/review in one PR. It would also be a massive waste if people didn't even want it in the first place.

Also yes all of this works (as far as I know)

Things I plan to add in later PR's

    Layers / colors (maybe) done
    Machinery (Stuff like chemical processors, filters, special mixing chambers and factories)
    Make geysers more interesting, so chemists/atmostechs/cargotechs/assistants can go to lavaland and get some exotic stuff.
    Pipe fractures. Damaged pipes could do the cartooney water soaker beam coming out to shoot at people cause why the fuck not.

Code concerns:

    Connecting is handled through pipes only. Not sure if this is the best approach. This means plumbing devices cant directly connect to each other without pipes. I could add some exceptions to handle it. I could also take connecting away from pipes and make it a global proc, with alot of exceptions since it'd be handling both plumbing machinery and the ducts.

    Reagent transferring. Basically the transfer is instantaneous from A to B. I did this because stuff getting stuck in pipes could pose some serious mixing problems with chemistry, since it's alot more delicate than atmos. I could understand if people would want it to be like atmos. It wouldn't be difficult to change.

Also for testing I suggest you set the pipe_dispenser to category 3 to print fluid ducts. My tests were done with
/obj/structure/geyser
/obj/structure/reagent_dispensers/plumbed/storage
/obj/item/plunger/reinforced
/obj/machinery/power/liquid_pump
/obj/item/pipe_dispenser/plumbing
that and standard tools for setting things up
2019-07-09 11:58:02 +12:00
Emmett Gaines
328fc7b1f1 Adds elements: Lightweight shared components/Global components (#44817)
If you came here thinking this was some game feature then you are in the wrong place. Here is where I ramble about code.

This adds /datum/element as a sort of sibling to components. Only one of each type gets instanced and they do not get tied directly to any particular thing like a component does. Basically they're a very lightweight component for doing simple functionality that doesn't have much state.

Originally this concept came about as a kind of component that could be shared between many parents to reduce some resource costs. Doing this would allow us to componentize more behaviors that are a part of too many things to be viable to have a whole component for every single one. For example a component on every space turf would be entirely unviable. With elements it's much more reasonable.

This implements a prety bare framework and a couple components are migrated to it. It's ready to be used but I fully expect I'm going to need to refine how it works for all the usecases we'll want it for.

Also: this fixes the qdeleted signal. This signal isn't even possible because after qdel is done there's nothing to receive a signal anyway. I've changed it to a qdeling signal instead. I need it to work for some elements to know when to clean themselves up.
2019-07-09 11:26:51 +12:00
AnturK
6c2a6e8d64 Supresses policy file runtime but messages admins about it. 2019-07-07 21:28:21 +02:00
Garen Crownguard
534a9140aa merge 2019-07-05 17:59:38 -05:00
oranges
64460ae3ca Merge pull request #44825 from AutomaticFrenzy/patch/lints
In advance of eventually adding SpacemanDMM's linter to Travis, fix everything it can currently detect.

Some lists, including global lists, are given types so that L[i].foo expressions can be checked.

Some procs are given a new form of return type annotation so that DuplicateObject(O).forceMove()-type invocations can be checked.

Open to syntax suggestions on the return type annotations, and on whether the preprocessor strategy makes sense.

Return type syntax is currently roughly:

    <typepath> | <paramname>([_])*(.type)?
2019-07-03 19:31:11 +12:00
ShizCalev
6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
kingofkosmos
ad64678c48 Merge branch 'addswarningspans' of https://github.com/kingofkosmos/-tg-station into addswarningspans 2019-07-01 13:32:24 +03:00
kingofkosmos
51f77267f4 * revert error spans 2019-07-01 13:28:15 +03:00
Dennok
4ee3b050e1 shuttle_manipulator load fix
shuttle_manipulator on load now send shuttle to transit
2019-06-30 18:24:00 +03:00
AnturK
d8b023774e Quirk preferences fixes (#44823)
Removes the useless split by value lists. Updates savefile after
removing invalid quirks. I'd prefer usual savefile validation but quirk
lists are built pretty late. Other solution would be hooking all prefs
to after quirk SS initializes, this seems less intrusive if ugly but
I'm open to alternative suggestions.
2019-06-29 20:07:21 -07:00
AffectedArc07
c4e75bc40b [READY] SSdiscord and Round Notifications (#44231)
* Notify System

* V2

* Adds a hint

* Stoned fixes round 1

* Use grammar wells I can

* This didnt work

* I wish you could test on TGS without committing

* Jordie fixes round 1

* oops

* This took way longer than it should have taken

* Adds in endnotify for serverops

* Spacing
2019-06-30 00:43:25 +10:00
JJRcop
938789d0a7 [READY] Blocked words tell you which ones (#44728)
About The Pull Request

Same premise as #44712 but using a simple regex replace and also on the client side
Closes #44712

I was gonna PR it to #44712 but half way through I realized I had already replaced nearly all of bobbah's changes, and after I was finished the branches shared nothing.
Why It's Good For The Game

The delta is way smaller and simpler
Should solve the DoS concerns without needing a limit on bad chats because it's not a loop it's on the client side
Changelog

cl JJRcop and Bobbahbrown
tweak: When attempting to say a blocked word in character you will be notified which ones were blocked.
/cl
2019-06-29 21:09:56 +12:00
Emmett Gaines
48f19baba1 Randomizes lavaland atmos (#44427)
This makes lavaland atmos random per round. You won't get eternally burning hell worlds or vacuums but it's nice for a bit of variety.

Admins can edit the gas mixture for all of lavaland at once if they want to ruin some miners' day.

image

cl
add: Lavaland atmos is no longer a preset gas mixture and varies per round
tweak: Bonfire minimum oxygen content has been reduced
/cl
2019-06-29 21:07:26 +12:00
AnturK
340106b7bc Skip quirk assignment for characters without station role (#44781)
I'm getting tired of fixing wrong assumptions about what equipment is
available or when quirk assignment happens.
2019-06-28 16:03:59 -07:00
kingofkosmos
c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
kingofkosmos
ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03:00
Tad Hardesty
b07065a477 Add additional type annotations to lists 2019-06-25 22:48:10 -07:00
spookydonut
18e92e152b Makes shuttle load in transit level [TESTED] (#44676)
* Removes shuttle manipulator

* oops

* fuck it lets just remove it.

* Revert "fuck it lets just remove it."

This reverts commit 8a95879f21d3f4aad3d56e33fa90ebc1940c1e27.

* re-remove the old admin proc

* Make shuttles load in transit level

* Add check

* oops

* i need coffee
2019-06-24 09:50:47 -04:00
Garen Crownguard
3a37d0322c merge 2019-06-23 20:39:24 -05:00
spookydonut
c5f7f5b063 Removes shuttle manipulator (#44655)
* Removes shuttle manipulator

* oops

* moves ui to ssshuttle

* fuck it lets just remove it.

* ooops

* Revert "fuck it lets just remove it."

This reverts commit 8a95879f21d3f4aad3d56e33fa90ebc1940c1e27.

* re-remove the old admin proc
2019-06-23 21:24:10 +02:00
Emmett Gaines
d615abf23c Replaces callbacks in signals with simple proc paths (#44579) 2019-06-22 18:21:57 +02:00
Unknown
62edbcf64f Satisfies the fruit 2019-06-19 19:48:08 -06:00
Unknown
8e65bb63c4 Config 2019-06-19 18:39:34 -06:00
oranges
d3f5e23b02 Merge pull request #44593 from XDTM/SpamsOver
Makes lowmemorymode spawn the transit z level, fixing the shuttle error spam
2019-06-19 10:00:49 +12:00
oranges
99044ecabe Fixes the AI job assignment (#44628) 2019-06-18 23:18:04 +02:00
FrankFo
645156ff60 De-linkifies names in deadchat_broadcast(), makes deadsay css class default (#44600)
* De-linkifies names in deadchat_broadcast(), makes deadsay css class default too

* Makes the source argument come after message, since it is optional

* Removes excess </span>
2019-06-18 22:49:02 +02:00
AnturK
4bc7b04386 Fixes head job assignment order (#44587)
* Fixes head job assignment order

* Makes this shared list

* Hmm yes
2019-06-17 16:51:41 -04:00
XDTM
afcbb30024 Makes lowmemorymode spawn the transit z level 2019-06-17 17:31:49 +02:00
oranges
b734e62ecf Merge pull request #44513 from AnturK/policything
Displays job policy when joining
2019-06-17 14:00:13 +12:00
AnturK
e4ad4661b8 Fixes secret sauce reagent choosing (#44521)
I had these on previous fix branch but seems i forgot to push whoops.
Fixes #44520

cl
add: Recipe for fabled secret sauce can now be found in the deepest reaches of space.
/cl

Changelog because i forgot one when i actually added the feature.
2019-06-17 13:57:15 +12:00
oranges
07abe542a8 Merge pull request #44548 from vuonojenmustaturska/sanity
Add periodic cleaning of several player-containing lists to server tasks
2019-06-17 13:56:41 +12:00
vuonojenmustaturska
375eb4b5ba Update server_maint.dm 2019-06-15 20:31:42 +03:00
vuonojenmustaturska
e57ab0a85b Add periodic cleaning of several player-containing lists to server tasks 2019-06-15 20:20:43 +03:00
AnturK
7c33571386 Displays job policy when joining 2019-06-14 08:25:47 +02:00
ninjanomnom
56196df9c6 Reverts datum outputs
reverts #43038
reverts #41535
2019-06-13 20:09:10 -04:00
Mickyan
1ab6b264d8 I need my payday, too (#44353) 2019-06-11 11:06:52 -04:00
AnturK
69ac935bde Upgrades policy config + policy verb. (#44296)
* Upgrades policy config + policy verb.

* Better example and proper default value.

* hr on top

* Cleanup
2019-06-10 11:51:25 -04:00
81Denton
b8f4737b22 Adds cheesie honkers to Clown phobia (#44385) 2019-06-08 20:20:25 -04:00
TheChosenEvilOne
d1039623dd Fixed multiple map voting issues (#44378) 2019-06-08 13:14:40 +02:00
oranges
a9476642cf Techweb clash warning now shows path clashing (#44321) 2019-06-05 20:52:17 -07:00
oranges
2e5a3c2226 Merge pull request #44319 from actioninja/gaybabyjail
Fixes an issue with the anti-antag rolling system where players were getting banished to nullspace
2019-06-05 18:45:22 +12:00