Commit Graph

259 Commits

Author SHA1 Message Date
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
vuonojenmustaturska
6406896df1 Replaces a bunch of obj vars (and emagged on machinery/items) with obj_flags (#34078)
* It works, but is it worth it?

* bitfield helpers take 1

* Would this work?

* remove dangling debug code

* rebase & fixes

* vv bitfield stuff, reading

* DNM oceans of shitcode DNM

* honk

* honk2

* plonk

* rebase & fix
2018-01-22 20:19:46 +01:00
Iamgoofball
3dde1d253c The Express Console emag effect is now a proper emag effect (#34373)
* The Express Console emag effect is now a proper emag effect

cyka blyat

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm
2018-01-15 00:48:34 -05:00
modularized_suicide
24d352c14c name change + comment 2018-01-08 08:40:58 -05:00
modularized_suicide
bd20f13e0c adds framework for making droppod-specific packs 2018-01-08 08:40:58 -05:00
modularized_suicide
9c547d532b penultimate fix 2018-01-08 08:40:56 -05:00
Emmett Gaines
25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
Tad Hardesty
71659b1e1a Tidy non-telecomms radio code (#33381)
* Remove extraneous parameters of receive_signal

* Delete unused signal datum procs

* Remove signal/var/encryption in favor of data

* Add and use datum/signal/New

* Clean up PDA and pAI integrated signalers

* Remove unused send_hear proc

* Clean up vars on obj/item/radio, change receive_range to can_receive

* Remove suffix var from radios

* Fix cell timer radios
2017-12-15 11:37:58 +13:00
vuonojenmustaturska
a162837faf Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)
* big batch of loc assignments

* Update emergency.dm

* Update spiders.dm

* Update parrot.dm

* Update ripley.dm

* Update firealarm.dm

* seems to work

* this maybe works?

* brainmemes, again

* stuff

* fix brainmob, camera runtimes
2017-12-13 20:56:39 +01:00
Tad Hardesty
51c7bdc007 Replace radio frequency magic numbers with defines (#33236)
* Change transmission_method to use defines rather than magic numbers

* Use MIN and MAX_FREE_FREQ defines when bounds-checking radios

* Remove violently broken "Debug Signals" verb

The relevant Destroy() is never called, making the static pointers list
take lots of memory and be large enough, even at roundstart, to crash
the chat when invoked (25k+ entries).

* Remove unnecessary checks for SSradio not existing

* Move department frequencies from GLOB to defines

* Replace all hardcoded radio frequencies with named defines

* Change the radio filters to be defines

* Use a define for the default signaler code
2017-12-07 14:58:27 +01:00
ShizCalev
57f636b24b Adds games vendor resupply crate 2017-12-06 05:54:19 -05:00
kevinz000
5182128d2a refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249) 2017-12-04 10:33:01 +13:00
Kyle Spier-Swenson
8c4885cf6e Revert "Ore Stacking (#33062)"
This reverts commit 8e1ac5720d.
2017-11-28 22:56:54 -08:00
kevinz000
8e1ac5720d Ore Stacking (#33062) 2017-11-28 21:27:34 -05:00
ShizCalev
24ca193e7e Fixes big band music crate (#33138) 2017-11-28 20:01:29 -05:00
ACCount
f086eab113 Removes "machine prototypes" (#33134) 2017-11-28 03:41:09 -05:00
Leo
c719c555a5 Merge pull request #33089 from tgstation/revert-32926-cargo
Revert "Removes material exports"
2017-11-27 12:23:29 -02:00
KorPhaeron
d42b43c18d Revert "Removes material exports" 2017-11-25 16:40:26 -06:00
kevinz000
9fa91b8499 Fixes techweb exports 2017-11-23 18:47:21 -08:00
Emmett Gaines
7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b defines math 2017-11-22 17:36:58 -05:00
Jordan Brown
b520728af1 Merge pull request #32926 from KorPhaeron/cargo
Removes material exports
2017-11-21 08:40:28 -05:00
KorPhaeron
11e08a6252 Removes material exports 2017-11-19 22:48:56 -06:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
Jordie
8b19b490d1 JSON feedback (#32188)
* wip

* wip2

* makes code actually compile on 511 + fixes

* versioning

* s

* adds python conversion script, schema change and removes 'force ' from item_used_for_combat

* fix to compile

* forgot to actually commit this
2017-11-17 02:43:12 -05:00
AnturK
cd1c4f9df9 Pirate Event 2017-11-04 17:33:45 +01:00
Tad Hardesty
9fb288a601 Fix a few syntactic aberrations (#32284) 2017-11-02 03:21:14 -06:00
ACCount
b5e074661f Refactor of catpeople mutant organs (#32101)
* Refactor of cat mutant organs

* Damage multiplier for ears
2017-11-01 21:14:34 +01:00
as334
43edaedc29 Assmos part 1, #2 (#30791)
* First part of Assmos

* Adds tritium synthesis and basic in-body effects.

* Begins adding the higher tier gases. Removes Freon(not completely yet) adds new gases to scrubers. Fixes some dumb bugs.

* Whoops

* Adds effects and synthesis reactions for pluoxium and stimulum

* Kills Freon.

* Adds sprites

* Removes the magic numbers

* Hyper-Nobelium formation

* Removes Freon from maps.

* Initial Dunc Review changes

* Should ACTUALLY fix the maps this time.

* Dunc Final Review

* Debugging part 1

* Fixes brown gas synthesis

* Auto stash before merge of "assmos-pathconflicts" and "origin/master"

* fix compile errors

* Moves defines. Fixes stimulum coefficents.

* Reworks how Stim and brown gas work, adds tritium to tile fires, fixes a lot of general reaction bugs.

* fixes typo

* Hopefully fixes UI

* compiles tgui

* Tritium balance.
2017-10-26 22:11:56 -06:00
Tad Hardesty
13f32a938b Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 21:06:46 +13:00
TehZombehz
b4f2533359 Adds some new plushies (#30751)
* Adds some cartoony plushies

Adds some more cartoony plushies and adds them to the toy crate.

* Conflicts 1

* Conflicts 2

* Conflicts 3
2017-09-20 08:53:21 +12:00
Emmett Gaines
76c08c601a New squeaky datum and plushes (#30710)
* New squeaky datum and plushies

new plush subtype
clown shoes, bike horns, and mice slightly changed to use the datum

* narsie and ratvar plushes

* fixes duplicate obj/item/attack_self()

and other misc requested changes

* moves the sounds into initialize
2017-09-18 12:49:03 +02:00
jughu
87c404f672 Adds Lavaland items to weapon exports for cargo (#30403)
They're expensive, but those mobs are quite difficult to kill
2017-09-18 10:25:04 +12:00
kingofkosmos
a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02:00
Militaires
25e309d00a Adds Gondoland and the rare Gondolas (#30530)
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
2017-09-11 08:10:33 +10:00
Kerbin-Fiber
91a9164062 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter (#30531)
* Automatic changelog generation for PR #30416 [ci skip]

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Automatic changelog generation for PR #30416 [ci skip]

* Delete AutoChangeLog-pr-30416.yml

* Removes riot foam darts from the Donksoft Toy Vendor, however the Syndicate Donksoft Toy Vendor still has riot foam darts.

* Kek

* Changes magazine paths for he Vendors so the Station made one has no riot foam darts at all meanwhile the Syndicate one still has everything just how it is.

* Hopefully fixes this.

* Reee

* Another Fix

* Another Fix, while I'm at it

* My Changelog

* Minor Fixes

* Grammar Fix
2017-09-10 18:42:16 +10:00
XDTM
28a5901170 You can now click on symptoms in the Pandemic to see their description and stats (#29866)
* You can now click on symptoms in the Pandemic to see their description and stats

* Threshold info

* NO WHITESPACE
2017-08-19 19:52:09 -04:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Ian Turk
1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00