Commit Graph

298 Commits

Author SHA1 Message Date
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
Denton
e48edaf637 alphabetical order 2018-05-01 10:12:58 +02:00
Denton
17deccd316 cargo categories + crate types 2018-04-30 20:23:10 +02:00
Dax Dupont
4c7cf149c8 Fixes cargo scanner being invis. 2018-04-23 18:28:37 -05:00
Fox McCloud
057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00
MrDoomBringer
5851de5d2f fixes fuckup in expressconsole preventing packs being ordered when credits are low (#37239)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* fixes my errors
2018-04-16 20:13:43 -04:00
Denton
0835673c23 adds tesla coil crate 2018-04-11 14:57:17 -05:00
iksyp
910eb893b9 The supermatter crystal is now the parent object of the supermatter shard, rather than the other way around (#37025)
*every mention of /obj/item/machinery/power/supermatter_shard in the code should have been replaced with /obj/item/machinery/power/supermatter_crystal and it's variants.
*supermatter shard has been moved to /obj/item/machinery/power/supermatter_crystal/shard
*variable changes like gasefficiency and explosion_power has been switcharood in order to keep it in line with the game as of now
2018-04-11 22:18:49 +12:00
Grandmother of 50
a5c908a1d3 Provides more control over uplink surplus chances. (#36983)
Cant wait for the epic balance prs that people will fight in
2018-04-11 22:15:55 +12:00
MrDoomBringer
95370dcd80 Fixes the cargo Express Console's description [wtf why is there a sprites tag] (#36765)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* mfw the space jews finally leave the drop pod buisiness

gimme gimme the gee bee pee

the fuck ahaha
2018-03-28 13:38:03 -05:00
Armhulen
5ed2a56ced Refactors Spell and Martial Art Books to use Action Granters! (#36442)
* HE'S DONE IT

LETS GOOOOOOOOOOOOOOOH

* floyd. floyd. he's the floyd. floyd dude yeah yeah yeah yeah FLOYD

* fireball remarks, the other spells.

* YOU MEAN THE CHAOS FLOYDS

* what is a floyd, but a miserable pile of moodlets

* flflflflfoooaooayoyydd FLOYOYODDD DFFRRURURMPPFF

* FLOYDING LIGHTS LIGHTS LIGHTS LIGHTSSS

* GORGE YOUR MOODLETS, EMBRACE YOUR FLOYD

* no more floydposting, i removed the old spellbooks

* aaaaaaaaaaaaaaaaaaah ALL of the remarks added my fucking god

* 10 days to sunday travis.

* last minute fixes

* 1 fix

* 2 fix

* red fix

* martial granters

* MAMA MIA
2018-03-27 20:51:14 +03:00
MrDoomBringer
f70d7f703c Adds descriptions to all cargo orders! (#36077)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* tgooey

* tgui 2 erlectric boogkalioo

* TRAVIIIIIIIIIIIIIS

* DUNC I LOVE YOU

* guaranteed
2018-03-10 21:19:19 -06:00
Cameron!
083eefb6b9 Adds Medical Sprays (#36081)
* Adds Medical Sprays

Medsprays are a new application method for chemicals, functioning like a multi-use patch with an internal chemical reservoir.

This allows touch chemicals to be applied more precisely and with a delay, rather than instantly and imprecisely with a spray bottle.

Pre-loaded medsprays with styptic powder or silver sulfadiazine can be obtaiend from the NanoMeds, and empty ones will spawn in the secure chemical locker.

They will also come from the medical pack from cargo.

* Update packs.dm

* Volume adjustment, attack_self addition

* Adds Medical Sprays

Medsprays are a new application method for chemicals, functioning like a multi-use patch with an internal chemical reservoir.

This allows touch chemicals to be applied more precisely and with a delay, rather than instantly and imprecisely with a spray bottle.

Pre-loaded medsprays with styptic powder or silver sulfadiazine can be obtaiend from the NanoMeds, and empty ones will spawn in the secure chemical locker.

They will also come from the medical pack from cargo.

* Volume adjustment, attack_self addition

* Adds Medical Sprays

Medsprays are a new application method for chemicals, functioning like a multi-use patch with an internal chemical reservoir.

This allows touch chemicals to be applied more precisely and with a delay, rather than instantly and imprecisely with a spray bottle.

Pre-loaded medsprays with styptic powder or silver sulfadiazine can be obtaiend from the NanoMeds, and empty ones will spawn in the secure chemical locker.

They will also come from the medical pack from cargo.

* Volume adjustment, attack_self addition

* Forgot this

* removes unnecessary/annoying check

* replaces deprecated sterilizer spray bottles on Pubby

* Applies MrDoomBringer's sprites

* new sprites, by @MrDoomBringer

* two-line shuffle

* fixes double entry

* Adds logging

* code standards
2018-03-06 13:37:25 -05:00
MrDoomBringer
83d2cd94e7 Lowers the Cargo Express console's cost multiplier (#36078)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* must be funny

* in a rich man's world

* always sunny

* im retarded

* cobby wont like this one

* thanks jordie

* i told myself id never let shizcalev post the evil "conflict" comment. i thought i would be able to catch these sorta things

* cripes
2018-03-06 15:22:03 +02:00
vuonojenmustaturska
a1a45f07f1 makes cargo spawning easy (#36094) 2018-03-03 16:33:28 -05:00
81Denton
e6c3c0c61d Rearranges cargo packs (#35970)
cl Denton
tweak: Cargo packs have been grouped and sorted alphabetically. Station goal crates are now in the Engineering section.
tweak: The cargo security section has been split into security/armory.
tweak: Grouped all gas canisters and fuel/water tanks together in one section with raw materials.
spellcheck: Fixed a few cargo pack descriptions.
/cl

The supply pack list is a total clusterfuck with items strewn all over. I've attempted to fix it by grouping items together and sorting them alphabetically.

Since cargo is a touchy subject: This PR doesn't change any prices, access reqs or contents (if it does, let me know so I can fix it).

    Split security into two sections: security/armory
    Grouped all gas canisters and fuel/water tanks together in one section with raw materials
    Moved station goal crates to engineering
    Moved plasmaman supplies to emergency
2018-03-02 13:45:46 +13:00
Iamgoofball
16584b16c4 Crab Rockets #35959
cl Iamgoofball
add: Look sir, free crabs!
/cl

Crab Rockets are now orderable as a drop pod only purchase.
2018-02-27 09:31:35 +13:00
YPOQ
9a9183d705 Fixes bicycle riding (#35739) 2018-02-17 21:11:59 -05:00
Ashe Higgs
19482e5907 Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates (#35194)
* Adds anomalous pizza boxes

* Improves the code a tad, makes it favorite

* let's format this a bit better!

* Update pizzabox.dm

* Makes the message_admins call only without report
2018-02-07 12:51:58 +02:00
nicbn
9348ad9aad Fixes bloodpack sprite issues (#35288)
* Fixes bloodpacks with question marks

* .

* .

* .
2018-02-05 20:21:13 -05:00
vuonojenmustaturska
c4fd8715a5 Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#35291)
* Ore Stacking

* honk

* honk

* component memes

* honk2

* fix overlay off-by-1, sheet singular names

* Give the ores more descriptive names since sheets also have

* whoops debug memes

* atom editor memes

* fixes

* snowdin fix
2018-02-05 22:27:35 +01:00
Incoming5643
a3e6885582 Moves the rarely utilized bar drink flinging ability from an intrinsic bartenders are born with to an extrinsic book that anyone can learn the art from. Bartenders start with the book but it's also available from cargo. Also allows the ability to toggle where as previously bartenders were just stuck with it. (#35165) 2018-02-04 02:20:30 -06:00
MrDoomBringer
61b63b1752 Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#35249)
* yaga

* node change

* okay cobby
2018-02-04 01:32:52 -06:00
Ashe Higgs
5d999571a1 Adds pineapples to botany, and Hawaiian pizza (#35205)
* Adds pineapples.
2018-02-02 19:35:31 +02:00
Liam
85976b0e39 bye 2018-01-30 14:53:13 -06:00
Robustin
418a8c0112 Cult Update (#33810)
* Cult overhaul
2018-01-30 21:59:03 +02:00
Nick
4d6f06ec80 Readds bz canisters to cargo order packs (#34950)
* Update packs.dm

* Update packs.dm
2018-01-29 02:38:07 +02:00
Togopal
458c68143f [READY] SNAKES! (#34724)
* actual phobia created

* (LAST ATTEMPT) Adds Snakes

🆑 Togopal
add: Snakes! They hunt vermin on the station!
add: They can be purchased in cargo.
/🆑

Mice can be a problem in late round random events, and I figured releasing a bunch of snakes in maintenance would be a more long-term solution than constantly running around with a crowbar when you hear them.

Now with updated sprites!

(I apologize heavily for uploading this three times. I was unaware I was using an older fork, as this was my first attempt at modifying the code.)

* curator gets trauma! and fixes to snek trauma

* fixes the travis error

silly frog

* Reduces the cost of a normal snake crate in Cargo. Adds retaliation to snakes upon being attacked, removes venom from regular snakes.

I A

* quick fix

* quick fix 2

* fixes the cargo contains = list

* go away TRAVIS

* changes the name of the snake cargo crate of regular snakes to avoid confusion

* Updates how some snake mechanics works

Makes them actually retaliate, code is still sort of buggy though

* Some orange fixes

* Fix snakes on this motherfucking plane

* The thing oranges said
2018-01-25 09:11:37 -06:00
MrDoomBringer
9ec4f2fe3f Adds the Bluespace Drop Pod upgrade to the cargo express console (#34560)
Researching an upgrade disk from RnD allows you to upgrade the Express Supply Console (#33436).

Instead of normal drop pods, which crash then stick around until you dissassemble them, the console will call down new Bluespace Drop Pods, which will teleport out after crashing (and bring about a slightly smaller crash-explosion too!)

🆑 MrDoomBringer
add: The RnD department can now develop firmware upgrades to the Express Supply Console, unlocking advanced cargo drop pods!
/🆑

why: adds a little bit more techweb-integrated progression to cargo, also part of a compromise from #34374.

oh, also repaths bsdroppod.dm to supplypod.dm
2018-01-23 20:35:59 +13:00