Commit Graph

326 Commits

Author SHA1 Message Date
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
XDTM
af50573d85 Virus crates now contain randomly generated viruses instead of single-symptom advance presets (#38412)
* Virus crates now contain randomly generated viruses instead of single-symptom advance presets

* fix

* mapswap
2018-06-13 00:44:19 -07:00
vuonojenmustaturska
c65a99f130 Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 11:36:31 +02:00
CosmicScientist
a9dea4db8b Removes normal ways to obtain drones (#38101)
I don't want this merged as soon as, I'd just rather normal drones to go away if no-one offers to fix their broken state.

Going to see if I can find out from someone how to edit maps tomorrow to remove the dispensers from them since you can't make them and I swear I've seen them before.

    remove any way to obtain drones outside the dispenser
    remove dispenser from maps

Edit: To better explain for the sake of a good PR body and a lack of a link to the PR a day ago, drones have been in the code in roughly the same state for 3 years (dispenser PR by Xhuis is missing from GitHub) and have gained laws admins enforce when they notice drones doing the wrong thing due to it being a ghost role. The code verbally dictates this will happen. The role hasn't been coded to prevent these many wrong things and has weak balance to begin with being a monkey with a vent ready backpack.

Administration hasn't stopped caring about this role. It should be in their direct hands until the role is clearly not an administration problem and fixed to represent that.
2018-05-31 12:20:14 +12:00
Tlaltecuhtli
83422a9064 ss 2018-05-28 06:59:14 +02:00
81Denton
3ab5c8fdbc Adds departmental wardrobe vendors to all maps (#37992)
* pubby, omega, meta, deltastation

* groups/sorts autodrobe packs and mining vendor items

* moves delta bar vendor

* expands omega+meta private studies
2018-05-24 18:10:42 -07:00
MrDoomBringer
32c8d0abc5 Cargo Update: Cargo Supplypod Beacons! (#37345)
(THE CODEX ASTARTES CALLS THIS MANEUVER: STEEL RAIN) [New sprite!]

* file

the boy

asdh

beacon overlays

first pass complete bring out the drinks boys

fixes!

fixes!

whups fix name

speed

makes coffin a crate to prevent runtimes

sprite fuckup:the musical

whups more fixes

why tf was screengen modified???

TO THE FILE

devices

changes things

p[omf pomf

uhg

alright fuk it

issue fix pt 1

in which i make merge conflicts my bitch

by fixing devices.dmi and tgui.js

oh shit

forgot about the items repath

hm

nah

merge conflict a

then all ya gotta do is whip

* shiv review me code reeeeeeeeeeeeeeee

* rebase conflict

* anturk

* asdf

* wooooeeeeeeh makin bacon

* dont forget about lil old me

* id like to give a shoutout, to my man spacemaniac. on the soul plane. rip in peice, my bugs. rip in peice

* spacy man what is ur spacy plan

* 1st

* 2nd

* organization also a thing

* so i figured out why defines didnt work sometimes across files. this fixes the last issue rn

* forgot to cop the commit

* fuck how am i so stupid

* adds comments and agrees with spacemaniac

* asdfghjk
2018-05-24 17:02:51 -07:00
vuonojenmustaturska
4f0b0b7ec1 Replaces /atom.initialized and .admin_spawned with flags (#37981)
kill .initialized and .admin_spawned from /atom
2018-05-24 02:20:50 -07:00
Firecage
c1f10aecce Adds department wardrobe vendors to the code and to Boxstation. (#37859)
* Adds wardrobe vending machines.

* Adds the refill cartridges to cargo.

* Removes access requierments and fixes spelling errors.

* More spelling errors fixed, curse the English language.

* Added sec skirts and grey uniforms to the sec vendor, and added formal uniforms as premium items to it.

* Fixing some grammer/spelling errors and adds the purple bartender uniform to the vendor.

* .

* Does Shizzy's requested changes.

* Adds these machines as options at the vendor circuit board. Adds more product ads.

* Fixes compile error.

* Sprite fix and two more things to the MediDrobe.

* adds the sprites

* Adds the vendors to box station.

* splits the supply packs up into different departments. Costs adjusted to be consistent with the autodrobe crate.
2018-05-21 19:12:22 -04:00
pubby
9ca6661140 [ready] cargo bounties (#37833)
* Cargo Bounties

* Rebalance and merge exports into bounties.

* Tweak and add bounties.

* Fix spelling errors + tweak mech prices.

* Last minute bugfix

* Add bounty consoles to maps.

* Naksu changes

* save 500 cycles woooooooooooooooooooooooooo

* One last price tweak

* Nerf addy and alien sheets
2018-05-20 18:44:11 +12:00
Tlaltecuhtli
a77f88b961 Bring gender equality to Corgi crates (#37748)
* brings gender equality on /tg/station
* what if this works
2018-05-10 17:56:42 -07:00
Tlaltecuhtli
3d36e68d8a fixes a money loop
🆑 
fix: fixes a possible money exploit
/🆑

why: if you buy the barrier crate, open it, spam all the grenades in vertical mode u ll get more money that the crate is worth
before: 4 grenades -> 12 barriers * 375 credits -> 4500 + 500 (crate) + 200 (manifest) -> 5200 which is a +3200 net gain
now:  4 grenades -> 12 barriers * 100 credits -> 1200+ 500 (crate) + 200 (manifest) -> 1900 which is a -100 net loss
2018-05-09 13:39:01 -05:00
vuonojenmustaturska
fd4c753a04 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 (#37597)
* kill BANG_PROTECT_2

* let's put this back in

* dirty

* kill OMNITONGUE_2

This is a write-only variable, probably leftover from some refactor years ago

* kill flags_2
2018-05-02 14:13:41 -04:00