Commit Graph

31148 Commits

Author SHA1 Message Date
ArcaneMusic 0855144ef6 Minor cleanup on plant analyzer modes and fixes plant instability loss (#50671)
* Several misc. botany fixes

* whoops, removes duplicates.
2020-04-26 13:18:36 -04:00
Ghilker 838b2b2ba7 Make the electrolyzer not a wait game (#50598)
* Electrolyzer balances

* better sprites(thanks trollbreeder!)

* reduce h2 export cost a bit

* h2 canister sprite change
2020-04-26 00:06:37 -03:00
Iamgoofball c1aec94be8 Fixes the 50% time dilation on every server by removing demos, an admin only tool that is the laggiest thing on the planet for incredibly little gain. (#50658)
* Fixes the 50% time dilation on every server by removing demos, an admin only tool that is the laggiest thing on the planet for incredibly little gain.

* appeases the linter
2020-04-26 12:54:01 +12:00
EdgeLordExe ad06bb4075 Penthrite rework: now it's actually usable![READY] (#50342)
* penthrite rework and ldx addition

* e

* Apply suggestions from code review

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* removes LDX , maybe in the future, not now

* you can od on penthrite and recipe is now changed

* ldx no longer exists v2

* mk2

* penthrite now requires salbu

* Apply suggestions from code review

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* e

* explanation

* penthrite requires wittel now

Co-authored-by: trollbreeder <trollbreeder@users.noreply.github.com>
2020-04-25 15:12:21 -04:00
Bobbahbrown 6578479184 [READY] Runechat: 'Runescape-like' Chat Message Overlays (It's back!) (#50608)
* first-version

* let's do those recommendations first

* color moment

* reorganization, prefs

* certified layer moment

* virtual speakers BEGONNE

* remove naughty bits, better sizing

* gimme the message mode

* rename that pesky pref and hide chat bubbles

* exponential decay moment

* async moment

* fixes

* fixes

* the players have decided they don't want to hear themselves on radio

* Fix bug with holograms incorrectly rendering messages

* rohesie's suggestion

* Color tweaks

* hallucinating now shows message properly

* pref moment

* updates

* rohesie's suggestions

* fix moment number 5

* less smelly more epic

* unfix the fixes and refix them

* a conscious change

* return of the prefs
2020-04-25 15:48:10 -03:00
MarioWizard119 51867bb116 Purge Medicine Buff (Multiver and Calomel no longer suck!) (#50583)
* multiver is good now

* Calomel is good too

* ok, multiver was a bit too good

* Ok maybe multiver was too good

* travis machine broke
2020-04-25 14:44:42 -04:00
Jordan Brown 2f8c10afd6 Update DMAPI to 5.0.0 (#50611) 2020-04-25 15:36:36 +08:00
LemonInTheDark 02ecf7f3d4 RSF PR but again because github is **** (#50646)
* first step

* Thank you for all your work, time to go rest...

* Woop

* nightcode.mp4, docs to come

* docs

* There we go

* so uhhhh test your code kids

* Update code/game/objects/items/RSF.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/game/objects/items/RSF.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* handles some cleanup, makes the processing sane

* Changes changes changes!

* Makes a define, cleans up some dumb mistakes

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-04-25 00:43:39 -03:00
Aleksej Komarov b8edd9cddd Fix MalfunctionModulePicker (#50665) 2020-04-24 23:45:35 -03:00
LemonInTheDark 006cc4947d An attempt to clean up tesla code (#50530)
* An attempt to clean up tesla code

* macro-op

* there we go
2020-04-24 21:34:40 -03:00
SomeoneYouProbablyKnow 7ce87578a1 Adds the detective wardrobe (#50564)
* Adds the det vendor and map changes

* Revert "Adds the det vendor and map changes"

This reverts commit 8c9c59935fbfe1a6e858f69d16684a21f911b093.

* Unfucks the mapmege expect box. box soon tm

* Literally A newline

* Box and other stuff

* Changes the sprite

* Kilo and donut

Co-authored-by: J? the J man <Zeldin.nick@gmai.com>
2020-04-24 17:04:36 -03:00
Ghilker 849ff095c8 Tiered canister balance and QoL changes (#50565)
* QoL changes

* Update code/game/machinery/canister_frame.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-04-24 12:22:02 -03:00
RaveRadbury 27889d2217 Gives clown, mime, and tiki masks radial menus (#50634)
* Changes performer masks to be radial

Also changes some 1's to TRUE

* Adds tiki mask

Thanks to Fikou for pointing this out

* Swaps an entry in the clown mask radial

* One more aesthetic shift

swaps two again
2020-04-24 22:32:49 +08:00
zxaber 1a5540723f Borgs can no longer be synced to AIs on other Z levels (#50609)
* please check your connection and try again

* please check your EOF and try again

* forgot this one
2020-04-24 22:30:24 +08:00
Fikou edbab1e818 adds the meat clown (#50622)
* adds the meat clown

* funnier
2020-04-24 22:28:44 +08:00
spookydonut 9db363b992 Merge pull request #50627 from willox/dupe_fixes
Fix instances of duplicate variable definitions in types
2020-04-24 22:27:15 +08:00
spookydonut a334a455e5 Merge pull request #50628 from willox/exports
cargo exports no longer include subtypes when they shouldn't
2020-04-24 22:24:04 +08:00
RaveRadbury 4eb77bd0b5 Fan Hud (#50649)
* Should be ready to test

The compiler is throwing a tantrum so I'm committing here to debug.

* Merges hud.dmi with upstream

* adjustments

fixes some typos, adds a blank hud image for fanpinless crew

* It builds

* runtimes

it doesn't actually work yet, just compiles

* Progress

More runtimes removed

* It all works, runtimes sorted

pins made to not go above suit

* Update code/game/data_huds.dm

Adds Rohesie's suggestion

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Makes requested change

Thanks Rohesie!

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Makes requested changes

Thank you Rohesie!

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-04-24 00:10:00 -03:00
Qustinnus 204a4b55f6 Mining skill affects PKA again but only when used on rocks. (#50535)
* PKA

* haha imagine if that got merged
2020-04-23 19:16:01 -03:00
Fikou 4230492e77 adds the improvised pickaxe (#50534) 2020-04-23 18:47:48 -03:00
Archanial d80e059a55 Cult stun nerf (#50522)
* gonereducedtoatoms

* Icannotspellplesnofunofme

* bloodgone

* staminaloss
2020-04-23 18:02:35 -03:00
spookydonut 2b66dfbc61 Fixes "thats" in a few item descriptions. (#50520)
* Fixes "thats".

* /obj/item/pickaxe/rusted

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-04-24 01:16:56 +08:00
Fikou 6b85530a8c fixes my stupid (#50595) 2020-04-24 01:16:33 +08:00
Fikou 4a5f5dbfe3 only carbons can now use the slap and circle emote + exploit fix (#50616)
* fixes

* only carbons can now use the slap and circle emote

* this should fix it

* im reatrd
2020-04-24 01:11:15 +08:00
spookydonut e573878ff3 /obj/item/pickaxe/rusted 2020-04-24 01:07:40 +08:00
spookydonut f60c57c14a Merge pull request #50541 from EgorDinamit/fluffwrench
Small fix for Forgottenship ruin.
2020-04-24 00:53:22 +08:00
spookydonut 72617ed483 Who roped me into this. (#50537) 2020-04-24 00:51:57 +08:00
Qustinnus f8a99c28a7 removes confusing bitflag in research.dm part 2: no webeditalaroo (#50536)
* epic kevinz moment

* extra checks

* done

* fixes

* forgot this one

* webedit
2020-04-24 00:50:47 +08:00
Fikou 0ec86b44b1 adds new stamps, resprites old ones, various cool stuff (#50573)
* adds new stamps, resprites old ones, various cool stuff

* FUCK

* fix

* today i will forget a comma

* ok i guess
2020-04-24 00:43:12 +08:00
Bobbahbrown 2d03a01fe0 Ninja Suit Initialization Refactor + Cleanup (#50563)
* ninja cleanup

* documentation

* missed these
2020-04-24 00:42:02 +08:00
Iamgoofball c681d26252 He sold on the cargo shuttle? Bugfix eet. (#50599) 2020-04-24 00:39:21 +08:00
spookydonut 2303d750cf Merge pull request #50604 from ArcaneMusic/cashlogging
Basic economy logging.
2020-04-24 00:38:08 +08:00
spookydonut 66c336c535 Merge pull request #50614 from actioninja/hydrotray-runtime
Fixes a runtime on hydroponics trays
2020-04-24 00:37:07 +08:00
spookydonut a00778f16e Add EYE_STAB to item_flags (#50556)
* Add EYE_STAB to item_flags

* add to surgicaldrill and scalpel
2020-04-23 12:28:37 +02:00
William Wallace c909880118 cargo exports no longer include subtypes when they shouldn't 2020-04-23 05:21:27 +01:00
William Wallace d93942a53a serving tray and cafeteria tray designs now have unique type paths 2020-04-23 04:05:59 +01:00
William Wallace 37b2a53315 remove duplicate minbodytemp var from 'king of the goats' 2020-04-23 04:04:52 +01:00
William Wallace 5e6c3a9c72 remove duplicate custom_price definitions from drinking glass & shot glass 2020-04-23 04:04:18 +01:00
William Wallace 0039686bf5 families: beat cops spawn with correct backpack (removing duplicate var) 2020-04-23 04:02:41 +01:00
William Wallace 8b0dbcc3eb micro battery export no longer overridesnano battery export 2020-04-23 03:59:45 +01:00
William Wallace 4ca90810c9 Shambler's vendor now has correct light color (fixing typo) 2020-04-23 03:59:02 +01:00
Arkatos1 321294a5cb Dominate & Abyssal Gaze are now a pointed spells (#50621)
* Simple turf aim assist

* Abyssal Gaze, Dominate pointed spells, can_target cleanup

* Cleanup

* Icon cleanup and fixes

* Duplicit check

* Update code/modules/spells/spell_types/construct_spells.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-04-22 16:39:17 -03:00
Fikou 564620c14d changes cult sprites + radials (#50620)
* makes cult sexy

* turns cult sprites into sex

* gurgr

* hola

* final commit maybe

* FUCK

* shit

* a

* walla walla bing bong

* man fuck

* i didnt even know you could do this wtf

* new sounds from actioninja

* ahoy spongebob

* yeah

* bazinga

* should be finished

* oops
2020-04-22 11:57:00 -03:00
spookydonut 1dc685af42 Merge pull request #50578 from trollbreeder/mapeditoricons
Adds icons for gibspawners and mob_spawns to help with mapmaking
2020-04-22 18:57:02 +08:00
spookydonut 17bd8c2099 Merge pull request #50576 from Fikou/patch-1
you can now make honeybuns again
2020-04-22 18:50:06 +08:00
spookydonut e0bd402f03 Merge pull request #50584 from jacklecroy/ramadan
Adds foreign calendar datum and fixes Ramadan holidays
2020-04-22 18:48:54 +08:00
actioninja 703274cf02 Fixes a runtime on hydroponics trays 2020-04-22 02:10:12 -07:00
Iamgoofball 1e417ef119 Removes Metalgen Recipe (#50552)
* Fixes the economy.

* Update others.dm
2020-04-22 00:55:15 -03:00
ArcaneMusic 9d1ecb188d Fixes merge conflict 2020-04-21 21:09:56 -04:00
ArcaneMusic b20683b1e0 Merge remote-tracking branch 'upstream/master' into cashlogging 2020-04-21 21:02:38 -04:00