Commit Graph

25117 Commits

Author SHA1 Message Date
Armhulen d4413fafcb Plasmamen organs GET sprites! (#37595)
* DONE

* initial

* Removes random slashes
2018-05-02 22:20:15 -04:00
pigeons cd9ac761e2 Removes stock market (#37414)
This removal is motivated by both gameplay and technical reasons.
Gameplay:

The stock market being a part of a station's Cargo department does not make sense, for either practical or lore purposes. The mechanic is bad because players are receiving cargo points from literally nothing. There no kind of freight handling or any other sort of bottleneck at all, just number entry on a computer from a seat. The stock market code is quite complex and a good attempt was made at simulating a stock market. However the attempt falls short, as it is still quite easy to manage stocks to grow points passively and safely. The stock market is also a multiplicative source of income so any other cargo point source gets extra scrutiny over balance, undeservedly so. Other aspects of cargo have already repeatedly taken hits. Such nerfs include the decreasing marginal returns for most exports and the base export price of plasma. I've noticed cargo doesn't care as much about exporting plasma as much as they used to.
Technical:

There seems to be a major issue with stock growth, particularly one bug in particular that grows stock prices to astronomical levels. As I mentioned before, the stock market code is quite complex, not to mention long. @Iamgoofball himself does not seem to making an earnest attempt to properly maintain and fix the issues, instead constantly making controversial band-aid fixes and removals (pot, kettle here I know). I would normally make a fix attempt as the code seems interesting but I do not agree with the stock market being a part of the game for gameplay reasons and thus have no interest. I have other ideas for cargo but they are still in the ideas stage so they are worth nothing. Still, I think removing the stock market and making room for other cargo features is the best move.
2018-05-03 10:47:57 +12:00
Grandmother of 50 56713f1439 Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) (#37609)
* Update alcohol_reagents.dm

* removes period
2018-05-02 18:30:23 -04:00
Grandmother of 50 dfc2cabfe4 Update machine_designs.dm (#37289) 2018-05-02 23:11:33 +02: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
Hyacinth-OR b0b7f2df9a Adds grenadine. (#37598)
* Adds the grenadine sprite to drinks.dmi

* Everything else, woops!

* Sprite tweaks.

* Requested changes!

* hopefully fixes merge conflict issues.

* Removes bad files!

* Messed that one up!

* dupe!

* dupes...
2018-05-02 14:12:37 -04:00
Jordan Brown 39bfefe4d3 Merge pull request #37606 from ShizCalev/storage-implant-uplink-description
Corrects mistake in storage implant uplink description
2018-05-02 09:37:32 -04:00
vuonojenmustaturska 1f1bc2ed32 Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too (#37035)
* APC crap

* moar define

* honk

* cover defines
2018-05-02 08:32:00 +02:00
Jordan Brown 9e42524ff5 Merge pull request #37590 from 81Denton/cargo-categories
Reorganizes cargo's big "miscellaneous supplies" category
2018-05-01 16:38:04 -04:00
Jordan Brown b3938446f1 Merge pull request #37580 from 81Denton/craftable-hudsunglasses
Craftable HUDsunglasses
2018-05-01 16:35:47 -04:00
europax 5a78cf1874 Adds 5 new drinks (#37589)
* Added 4 sprites

Added sprites for Alexander, Between the Sheets, Kamikaze and Sidecar.

* Added recipes for 5 drinks

Added recipes for Alexander, Between the Sheets, Kamikaze, Mojito and Sidecar.

* Added 5 drinks

Added Alexander, Between the Sheets, Kamikaze, Mojito and Sidecar.

* Added Creme de Menthe to Mojito

* Changed Creme de Menthe to Menthol in Mojito

* Adds menthol and sake to the dispensers

* Adds menthol to drink reagents

* Removes menthol from drug reagents

* Added the box of menthol

* Adds menthol to the booze-o-mat

* Adds the menthol box sprite
2018-05-01 13:42:05 -05:00
AnturK 346819e30c Readds missing nuked narsie cinematic. (#37584) 2018-05-01 12:04:55 -04:00
Jordan Brown 6ff57368b0 Merge pull request #37516 from XDTM/LinearBrainDamage
Changes the trauma formula so constant small ticks don't keep triggering traumas
2018-05-01 10:56:18 -04:00
ShizCalev ee512437d9 Corrects mistake in storage implant description 2018-05-01 08:19:56 -04:00
XDTM e733e139c5 fix 2018-05-01 12:23:20 +02:00
Denton e48edaf637 alphabetical order 2018-05-01 10:12:58 +02:00
Jordan Brown f91f5bb08f Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes
Fix runtimes in corpse code due to mob_spawners becoming null
2018-04-30 22:19:26 -04:00
Jordan Brown 748d9a9233 Merge pull request #37572 from deathride58/fixesdepression
Fixes the intergalactic stock market crash by removing the speculation/performance modifier
2018-04-30 22:14:51 -04:00
Alomga f3840f8715 Makes dizziness work again 2018-04-30 14:38:37 -04:00
Denton 17deccd316 cargo categories + crate types 2018-04-30 20:23:10 +02:00
Jordan Brown 0ebc0d81b2 Merge pull request #37510 from JJRcop/throw_myself
Circuits can't throw themselves
2018-04-30 14:05:01 -04:00
Jordan Brown 32f2f07e4d Merge pull request #37513 from ShizCalev/pineapple-memes
Adds traits for a character's preference towards pineapples.
2018-04-30 14:02:59 -04:00
Jordan Brown 2a2ad8fd79 Merge pull request #37549 from ShizCalev/bounce_away-fixes
Resolved var name conflict for bounce_away()
2018-04-30 13:52:52 -04:00
Jordan Brown 0fc0625ed2 Merge pull request #37539 from pigeonsk/sakememe
Ports sake with new sprites
2018-04-30 13:49:51 -04:00
Jordan Brown d4091e606c Merge pull request #37556 from 81Denton/techweb-sunglasses
More holosigns for techwebs
2018-04-30 13:48:23 -04:00
Jordan Brown 7e3b4e47a3 Merge pull request #37554 from DaxDupont/vents
Adds some more reagents to clogged vents
2018-04-30 13:47:37 -04:00
deathride58 336259d58b i give up - removes the speculation/performance modifier instead. 2018-04-30 10:32:58 -04:00
Pigeons f879167156 Adds sake to boozeomat 2018-04-30 07:17:01 -04:00
Jalleo 5d2db204bc [s] Small tweaks and fixes a edgecase with machine construction (#37494)
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
2018-04-30 13:01:43 +03:00
ShizCalev d86c2818a5 Removed /obj/item/asteroid path (#37500)
* Cleans up some item paths

* removed kebab
2018-04-30 12:57:36 +03:00
kevinz000 dc60377444 Fixes circuits being able to detect ghosts and fix pinless guns (#37437)
* Circuit exploit fixes

* Update input.dm
2018-04-30 12:56:18 +03:00
kevinz000 f31c01cecb beam rifle delay (#37544) 2018-04-30 12:54:25 +03:00
Fox McCloud 6cbf4483ee Fixes Blast Cannon (#37503)
* Fixes Blast Cannon

* no magic numbers

* tweak
2018-04-30 12:53:59 +03:00
ShizCalev 65ebea8413 [s] Fixes the fryer shrinking the size of objects (#37489)
* Fixes the fryer shrinking the size of objects

* few more vars
2018-04-30 12:52:46 +03:00
ShizCalev b0387b17da Fixes glass stack explosion act (#37498) 2018-04-30 12:52:11 +03:00
Denton f45d8106b7 craftable HUDsunglasses 2018-04-30 10:44:09 +02:00
Denton 82cf848456 removes HUDsunglasses from the premises 2018-04-30 09:46:08 +02:00
Evsey Antonovich c031e666b3 IC weapons only works on turfs (#37496) 2018-04-30 02:32:34 -04:00
ShizCalev ac2967fa66 Moved to vars 2018-04-30 01:20:37 -04:00
Mickyan ed3a11e2b8 Makes nutrition level show up on self-inspect (#37509)
* Makes nutrition level shows up on self-inspect

* Changed to switch statement, edited flavor text
2018-04-30 01:19:20 -04:00
george99g f28092423a Deactivate suicide prescans via ghost var (#36839)
* Create suicide_log proc in /mob/living

Suicide logging moved to there.

* Stop after-suicide prescan clones
2018-04-30 14:35:00 +12:00
deathride58 8e63755bdb fixes the intergalactic stock market crash 2018-04-29 22:13:27 -04:00
erwgd d988406583 added fly and moth categories to limb grower and limbgrower_designs.dm (#37349)
only human and lizard synthetic limbs will have should_draw_greyscale set to true

added /improper and uncapitalised synthetic limb names

removed plasmaman parts from human_parts_greyscale.dmi
2018-04-30 10:53:42 +12:00
vuonojenmustaturska 3eb30b16f3 Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use (#37530)
code: HEALS_EARS_2 is removed in favor of the earhealing component

code: wearertargeting component is available to subtype for components that want to target the wearer of an item rather than the item itself
2018-04-30 10:32:59 +12:00
vuonojenmustaturska ccf8fc5bc5 Kills off three more flags from flags_2 (#37529)
code: More flags have been moved to their appropriate places
SLOWS_WHILE_IN_HAND
FROZEN
NO_MAT_REDEMPTION

all moved to item_flags
2018-04-30 10:32:23 +12:00
oranges d9f9368c1d Merge pull request #37535 from cyclowns/fusion-fix
Fixes gas fusion power not being taken into account
2018-04-30 10:20:01 +12:00
Tad Hardesty 9f0f3bd32c Fix runtimes in corpse code due to mob_spawners becoming null 2018-04-29 13:59:41 -07:00
Tad Hardesty d0ae8933c0 Fix grammar when cleaning things with the damp rag 2018-04-29 14:28:52 -05:00
Denton cb884c8dce sunglasses and more holosigns for techwebs 2018-04-29 19:20:51 +02:00
Dax Dupont 841a6aff93 Adds some more reagents to clogged vents 2018-04-29 18:57:10 +02:00