Commit Graph

338 Commits

Author SHA1 Message Date
MrDoomBringer
e7fa2bd458 [Tested] supplypod sound update (#40531)
cl MrDoomBringer
soundadd: Supplypods sound a bit nicer as the land now.
admin: admins can now adjust the animation duration for centcom-launched supplypods
admin: admins can adjust any sounds that are played as the supplypod lands
/cl
2018-11-04 14:46:22 +13:00
Shdorsh
9343d9e70a [READY]Removal of circuits (#41108)
* Delete integrated_circuit.dm

* Delete integrated_electronics.dm

* Delete pins.dm

* Delete wirer.dm

* Delete helpers.dm

* Delete printer.dm

* Delete analyzer.dm

* Delete debugger.dm

* Delete detailer.dm

* Delete assemblies.dm

* Delete saved_circuits.dm

* Delete boolean_pin.dm

* Delete char_pin.dm

* Delete color_pin.dm

* Delete dir_pin.dm

* Delete index_pin.dm

* Delete list_pin.dm

* Delete number_pin.dm

* Delete ref_pin.dm

* Delete selfref_pin.dm

* Delete string_pin.dm

* Delete passive.dm

* Delete power.dm

* Delete access.dm

* Delete arithmetic.dm

* Delete converters.dm

* Delete data_transfer.dm

* Delete input.dm

* Delete lists.dm

* Delete logic.dm

* Delete manipulation.dm

* Delete memory.dm

* Delete output.dm

* Delete power.dm

* Delete reagents.dm

* Delete smart.dm

* Delete text.dm

* Delete time.dm

* Delete trig.dm

* Update tgstation.dme

* Update multitool.dm

* Delete circuit.dm

* Update tgstation.dme

* Update netdata.dm

* Update ntnet_interface.dm

* stuff

* Update packs.dm

* Update electronics_designs.dm

* Update electronics_designs.dm

* Update multitool.dm

* Update cavity_implant.dm

* Update cards_ids.dm

* Update walls.dm

* Update hostile.dm

* Update all_nodes.dm

* removes circuits from maps

* Revert "removes circuits from maps"

This reverts commit 14daf7770220a8a1d7a8fa497c92d9c866939160.

* Removes circuits lab from all maps

* removes circuits lab from lavaland syndicate base

* fixes space tiles under windows on meta

* Deltastation fixes

* Update multitool.dm

* Update flavor_misc.dm

* Replaces Box circuits with nanites
2018-10-31 15:17:04 -04:00
Youbar
565fa59574 Removes usage of variable ssshuttle.points 2018-10-25 22:49:04 +13:00
MrDoomBringer
62529acdde Cleans up and adds more concise admin logging to the centcom podlauncher (#40696)
* shoutout to spacemaniac and qusdtyu

* slight yeets

* slight grammer fixes

* yes

* asdf

* yikes

* fixes

* ok this should be better

* key_name

* begone, proc overhead
2018-10-23 14:45:19 +02:00
MrDoomBringer
e4db7a8477 Fix explosions damaging rod form wizards and supply pod contents (#40758)
The issue was that when casting rod form, the wizard is forceMoved() into the
rod. When an epicenter explosion happens, explosion.dm forcibly goes through
the contents of EVERYTHING, and calls ex_act().

This caused the wizard in the contents of the rod to get damaged by epicenter
explosions (ie if they hit a fuel tank in rod form)
2018-10-19 22:20:59 -07:00
MrDoomBringer
6dbb565198 fixes centcom_podlauncher delimbing not working as expected, adds a new "Yeet Organs" option to the podlauncher (#40537)
Fixes #40535
cl MrDoomBringer
fix: Centcom-launched supplypods will now properly delimb you (if they are designated to do so) instead of touching you then literally yeeting all of your internal organs out of your body.
admin: Centcom can now specify if they want to yeet all of your organs out of your body with a supplypod
/cl

added a new button to the centcom podlauncher that cinematically removes every organ of whoever is hit by a supplypod
2018-10-17 23:17:47 +13:00
MrDoomBringer
6bc963bd57 Centcom Supplypods now come with a ghost announcement + follow link (#40720)
* asdf

* does it to you

* ahahwhups

* build dat ass
2018-10-07 06:45:16 -04:00
MrDoomBringer
f4c879db38 the codex astartes is sad that this maneuver is being nerfed (#40491)
Fixes #40486

cl MrDoomBringer
fix: Supplypods no longer detonate their contents
/cl

I did this by adding a return value to the atom/contents_explosion() proc. If the proc is overridden, it should return null. This is then checked in explosion.dm to see if the contents have been properly exploded. If they havent (if contents_explosion() returns true), then explosion.dm handles it manually.

There might be a better way to go about this, if there is please let me know
2018-10-05 19:11:13 +13:00
MMMiracles
5ee8a6bb1f Adds clothing production for Botany (#40563)
cl MMMiracles
add: Botany can now grow cotton to produce cloth for various jumpsuits.
add: Cotton can be mutated into a much more durable strand, allowing for the production of crude armor.
add: Rainbow flowers, an alternative for clothing dyeing, is obtainable through cargo's exotic seed crate.
add: A loom can now be crafted with some planks so you can actually weave that cotton into a usable fabric.
add: Fannypacks, softcaps, beanies and scarves are now craftable with cloth and dyeable.
/cl

[why]: A way to produce clothing and naturally obtain cloth past ripping up other stuff seemed useful and with the economy aspect, might actually have some extra use.
2018-10-03 10:13:34 +13:00
81Denton
489c5f722e Tweaks reagent bounties (#40568)
cl Denton
tweak: Split chemical bounties into simple/complex ones and removed some that are disproportionately hard to acquire.
tweak: The "More Bounties" bounty now awards five instead of three new bounties.
/cl

tl;dr of this PR is:

A) Reagent bounties are split into two different categories - simple and complex.

Simple bounties can be mixed by a single chemist, but complex ones require either cooperation with a third department or some serious mixing.
Also, removed amanitin/coniine bounties since those should be added to botany bounties instead.

B) Tweaked bartender bounties

    Removed quintuple sec, as it relies on Bananium which can't be obtained every round
    Removed hearty punch, as it takes a disproportionate amount of effort to mix in large quantities
    Added bounties for peppermint patty, pumpkin latte and aloe

C) Increased the amount of "more bounties"

The variety and amount of available bounties has increased since the original PR; it only makes sense to increase the number of new bounties offered by this as well.
2018-10-03 10:09:14 +13:00
XDTM
6f21758521 Handheld IDs are valid for authentication (#40456)
cl XDTM
tweak: Holding an ID in your hands uses it instead of your worn ID for authentication purposes.
tweak: If you don't have an ID in your id slot, the belt slot will be checked as well.
/cl

Fixes #40437

Makes sense if you want to use a specific access card without playing pocket tetris. The get_idcard has an argument for prioritizing worn id over held id, for stuff like identification.
2018-10-03 09:58:37 +13:00
MrDoomBringer
32ffba28cd Adds a "Launch Supplypod (Quick)" adminverb (#40501)
cl MrDoomBringer
admin: Admins can now launch supplypods the old, slightly quicker way as well
/cl

Saves a few button presses, and some admins requested it.
Tested, should work fine.
2018-10-01 15:02:04 +13:00
Tlaltecuhtli
a70d6967a0 fixes bounty (#40466) 2018-09-25 23:51:53 -06:00
Iamgoofball
f735a7d34d [READY][PAID CODE] economy PR (#40312)
With the power of CAPITALISM AND ECONOMY, you too could be This Guy.
2018-09-23 02:50:51 -04:00
MrDoomBringer
b8426fd3ea Fix Centcom Podlauncher annoyances and makes express consoles work again (#40387) 2018-09-22 19:56:26 -07:00
MrDoomBringer
c7ef142616 [DOCUMENTED AND READY TO MINGLE](EPIC MEME VIDEO INSIDE!) NEW COOL ADMIN TOOL: ADVANCED HIGH DEFINITION SUPPLYPOD SUMMONING (also supplypod refactor) (PLEASE UPTHUMB) (#39936)
MrDoomBringer

admin: Admins can now spawn things in ICly (as well as do a bunch of other cool new stuff) using the Config/Launch Supplypod verb!

code: also supplypods have been refactored
2018-09-21 08:59:52 +12:00
Jordan Brown
9df41734cc Merge pull request #40231 from ExcessiveUseOfCobblestone/patch-57
[WEBBIT/NOT TESTED] Centcom are no longer crooks when it comes to adamantine bounty
2018-09-12 10:11:17 -04:00
Fear The Flash
92ec64b4d0 Operation "Closing Hours" is a go 2018-09-11 11:26:11 -04:00
Fear The Flash
6552d90d1e 💯 2018-09-11 11:12:13 -04:00
Fear The Flash
073c409466 Update item.dm 2018-09-11 11:05:12 -04:00
Denton
83cc4a0044 Adds plasmaman EVA suits to cargo 2018-09-11 09:28:08 +02:00
81Denton
d8393bed10 Add examine descs, air alarm construction descs (#39949)
A bunch of items were missing examine messages about their alt+click
functionality, I added them. Also, construction step descs for air alarms.
2018-09-05 23:06:23 -07:00
Tad Hardesty
aff11eaaa8 Give multiple copies of shuttles their own area instances (#39890) 2018-08-27 06:04:48 -04:00
intrnlerr
5400c206ce Turn Nettles into reagent_containers (#39763)
* Turns nettle into a "snack"

* fixes nettle mentions
2018-08-26 13:01:25 +12:00
81Denton
f957635646 Adds missing lavaland/engine exports, minor refactor (#39686)
* Adds missing lavaland/engine exports

* refactors lavaland loot exports

* thanks cobby

* fixes HECK names

* adds prison cube artifact

* removes broken H.E.C.K. export printout, adds 10k ash drake armour export

* reduces drake/legion export value, adds ruin loot

* adds new arguments from #39749
2018-08-24 13:49:01 +02:00
AnturK
bd72eb3371 Refactors exports and pirate loot gathering. (#39749)
* Pirate export

* Stuff

* ATTEMPT TWO

* Vault area was removed look for control terminal here.

* Fixes and improvments

* cb stuff
2018-08-24 12:50:53 +03:00
Tlaltecuhtli
58abdd739f fixes drill bounty (#39725)
* fixes drill bounty

🆑 
fix: fixes a bounty having the wrong object path
/🆑
fixes:  #39724

* both
2018-08-16 12:32:38 +02:00
81Denton
691dcd4ec1 Botany+Medical bounties, tweaks (#39658)
* Botany+Medical bounties, tweaks

* Adds foodtype var for flavor text, removes duplicate bounty
2018-08-14 00:07:37 +03:00
81Denton
abb5e84f37 Adds mining and engineering cargo bounties (#39568)
The game can use more bounties that require actual effort and cooperation to
complete, but give far higher rewards than the "collect some glass shards"
Assistant type bounties. Thanks again to Tlaltecuhtli for these ideas.

I added the following:

Engineering
Various atmos gases, price determined by how hard they are to acquire. I
deliberately left out Stimulum/Hypernobilium, as only a handful of players even
have an idea of how to make them. Plasma tank bounty got removed, since it's
just a case of "put tank into plasma canister and open valve".

Contained Tesla ball. The idea is to build a tesla setup inside the supply
shuttle, then ship it off. This pays a lot, since players have to purchase a
bunch of packs, get them unlocked+approved by heads of staff and finally
construct the whole thing inside a cramped shuttle. Materials alone cost about
14.000 credits for this one.

Tesla containment maintains power during the shuttle ride and it gets deleted
successfully on arrival at CentCom. As a failsafe, I've added both singulo and
tesla as 1 credit exports in case someone ships them over to CentCom without an
active bounty.

Mining
Almost everything you can craft from Lavaland fauna, from lava grilled steaks
over bone axes to goliath hide boats.
2018-08-08 21:12:56 -07:00
81Denton
05fb1c7b7f Adds five new cargo packs (#39569)
* Adds four new cargo packs

* god dang it bobby

* adds wrapping paper crate

* reduces carpet crate price, since it's a bunch of useless carpet

* adjusts festive crate price to 1000 bucks
2018-08-08 20:58:40 +03:00
Grandmother of 50
9af8953336 Implement Sci-Bounties, Bounty Setup Streamlining (#39507)
Kills off some vars, crunches code instead of doing the same thing 5000 times.
2018-08-04 17:24:20 -07:00
ShizCalev
3f82ac81a3 Nanotrasen capitalization (#39547)
Corrects a couple instances of improper capitalization of Nanotrasen.
2018-08-04 14:57:49 -07:00
81Denton
2940270880 Add four more bounties (#39421)
I added the following bounty items:

* Firefighter APLU for 18.000 dosh - 5.000 more than a Ripley APLU since it
  requires three times the amount of plasteel.
* Cat tail for 3000 since we already have a lizard tail bounty.
* Cat and Liz o' Nine Tails for 4000 as a variation on the tail bounties.
2018-07-30 13:32:07 -07:00
bgobandit
8f71d71f1e Fix more spelling/grammar (#39450)
self explanatory
2018-07-29 16:19:42 -07:00
81Denton
03e6bf6635 Removes cargo bounties that request irreplaceable items (#39431)
Kagus put the reason in words better than I could:

Do we really even want these bounties? They're kinda the odd ones out due to
being completely irreplaceable items, meaning that if they get lost/destroyed/
sold they are permanently gone from the station until a new round.

It ends up with either an empty bounty listing just sitting there and taking up
space forever or some cognitively impaired cargo tech feverishly trying to
break in because "I MUST MONEY" and they honestly have no idea what the actual
value of the item even is.

And to those who say "conflict breeds gameplay", I have never seen the SS13
community fail to make their own conflicts at every opportunity.
2018-07-29 13:51:29 -07:00
fluffe9911
a72eecaa95 Exotic Corgis 2 Electric Boogaloo (#39319)
I really liked cheeses idea but since the original pr got reverted decided to redo it so now the exotic corgi is its own type of dog so hopefully it should look slightly less like it ate a crayon also no talking corgi so the maintainers don't get angry hope I did this right!
2018-07-29 13:42:01 +12:00
subject217
be877e42d7 Fixes revolver bounty accepting wrong subtypes (#39312)
excludes two subtypes of ballistic/revolver 
rather unintuitive for these to be subtypes but lol guncode
2018-07-24 12:08:03 -07:00
kevinz000
d97bd6c0ae Removes flightsuits (#39195) 2018-07-18 17:46:53 -04:00
Trevor Serpas
bee0b5b2c3 Afterattack() Signal (#38606)
* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
2018-07-07 02:00:25 -04:00
81Denton
1e57be96fd Improves cargo shuttle/firefighting foam descs (#38927)
* Improves cargo shuttle/firefighting foam descs

* oof
2018-07-06 10:42:18 -04:00
ShizCalev
89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
Tlaltecuhtli
24b21b8416 [READY] better contraband crates (#38321)
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
2018-06-22 11:51:29 +12:00
ShizCalev
f338f09207 Cleanup & corrections 2018-06-20 21:57:17 -04:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
Tad Hardesty
eaf8bc3b42 Merge remote-tracking branch 'upstream/master' into patch/vending-machines 2018-06-19 13:07:13 -07:00
Tlaltecuhtli
eaa0b551df Advanced foam extinguisers (#38270)
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
2018-06-17 13:37:34 -07:00
Tad Hardesty
cdfe1261d1 Fix cargo pack descriptions 2018-06-17 12:47:59 -07:00
Tad Hardesty
870ac15480 Improve how vending machine restocking works 2018-06-16 23:02:41 -07:00
oranges
200caab258 Revert "Adds exotic and talking corgi crates" (#38454)
* Revert "Automatic changelog generation for PR #38276 [ci skip]"

This reverts commit 08e5c52f5f.

* Revert "Adds exotic and talking corgi crates (#38276)"

This reverts commit d83bc2c874.
2018-06-14 12:41:08 +02:00
chesse20
d83bc2c874 Adds exotic and talking corgi crates (#38276)
* add exotic corgis

* add talking corgi crate

* make talking corgi epic

* remove old codew
2018-06-13 05:39:54 -04:00