Commit Graph

5778 Commits

Author SHA1 Message Date
Skrem_7
15c64aff1a Autolathes can now be EMAG'd + Adds Illegal Ammo Design Disk (#18559)
* autolathes can now be emagged

* fixes dumb dumb linter issues

* Update code/datums/wires/autolathe.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* illegal ammo disk

* makes it so you don't lose disk designs if unhacked

---------

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2023-04-18 23:11:50 -04:00
Molti
a3f8756721 Ultra Violence martial art buffs (#18411)
* buffs

* update help verb

* tweaks defines

* nevermind, had it right before

* new changes

* update help
2023-04-16 23:47:17 -05:00
TheRandomHobo
117ed294b5 A few flavour texts for the drinks (#18480)
* Flavour text and a few additions added

* Update alcohol_reagents.dm

* Update alcohol_reagents.dm

* Update alcohol_reagents.dm

* Removed Amaretto Alexander

* Update alcohol_reagents.dm

* Update alcohol_reagents.dm

* Made it so it is mob reaction

* Update alcohol_reagents.dm

* Drink reagents have reaction mob added

* Updated drinks to correct methods

* Updated Alcohol_reagents to be right method

* Slight mistake fixed

* Fixed minor problems in reagents

* Update drink_reagents.dm

* Im a moron who forgot brackets

* Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

---------

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
2023-04-16 18:23:19 -05:00
Theos
e88a9c3b13 Jellypeople can no longer get the liver-that-kills-jellypeople from the advanced organ quirk (#18564)
* Jellypeople can no longer get the liver-that-kills-jellypeople from the advanced organ quirk

* oopse :3
2023-04-16 03:28:11 -05:00
Theos
6b845dd51f Mutation toxins are no longer instant, advanced mutation toxin cure changed from frost oil to ice (#18522)
* someone fucking broke tails again thanks guys

* uhm acktually being able to chainstun people with mutaton toxin is intended nerd emoji

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* switch chemical removal proc to a better one

* Update other_reagents.dm

---------

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2023-04-15 15:56:15 -05:00
Molti
b8a06c4b52 Update heart_failure.dm (#18488) 2023-04-12 13:54:25 -05:00
Theos
10d4ec7210 Radiation from contaminated objects no longer produces power in rad collectors (#18471)
* someone fucking broke tails again thanks guys

* Radiation from contamination no longer produces power

* oops teehee
2023-04-12 11:54:39 +02:00
Manatee
dd4b218924 awooga (#18462) 2023-04-07 12:13:59 -04:00
Redd
7672a0538c Fixes Chubby's PR and the NTOS Bluescreen associated with resetting the keybinds they added to default (#18473)
* fixes action keys not having a keybind

* Untested-ish preferences fix
2023-04-07 00:46:39 -05:00
LazennG
1da9f2bba6 buster arm can no longer be used while unconscious (unbased) (#18468)
* sleepwalking

* IF YOU LOSE THE ARM YOU LOSE THE ART FORREAL THIS TIME

thanks to @slicerv and @milk-is-cool for letting me know about how this happened
2023-04-06 21:41:08 -05:00
Hopekz
a862c2f4ba Adds 8 brand new "fun" AI lawsets (#18437)
* Adds more AI laws

* Makes them in to AI modules

* Whoops

* Hugboxed because I forgot I'm PR'ing to Yogstation

* Removed Chef AI law. Added 5 more
2023-04-04 12:25:27 -04:00
SapphicOverload
3b586e6301 A few minor IPC tweaks (#18157)
* step

* changed ultra violence grab sound, makes the step a bit louder

* Update IPC.dm
2023-04-02 01:16:42 -05:00
Ling
b008ae4767 Refactor internals code (#18301)
* Revert old code

* Refactor internals code
2023-04-02 00:31:59 -05:00
LazennG
a63261e534 buster style no longer totally negated by soap and flashes (#18401)
* what using a new check for the like second time does to a mf

* cant call it a breaker anymore oops

* missed a word oops

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

---------

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
2023-04-02 00:24:22 -05:00
Marmio64
0df7280416 quirktweaks (#18372)
Tweaks hemophiliac, brain damage, and cybernetic organ traits.
2023-03-31 17:05:50 -05:00
Ling
04d215d1db Ports the Hypertorus Fusion Reactor: Fusion in a machine (#17815)
* test 1

* Big update

* Remove broken atmos grenade

* Fix heat exchanger runtime

* HFR fixes

* Dynamic canister light

* Shitty yogs edit

* Better map

* Add corners

* Better canister lights

* Change item order

* Fix linter

* Fix duplicate defines

* Update binaries

* Revert config change

* Try this lib

* Fixed and re-added passive vents

* Betterer canister lights

* Refactor water vapor reaction

* Adds anti-nob effect to SM

* Overhaul pluonium_bz_response reaction

* Add helium text effect

* Small formatting fix

* Remove rad limit

* Fix gas icons

* Add rad signs

* Maybe better rad calc

* Even betterer

* Fix crack runtime

* Update map

* Merge nitryl and stimulum into nitrium

* Better nitrium everything

* Better nitrium formation

* Remove machine frame from incin

* Remove helium and overhaul HFR recipes

* Fuel update

* maybe fix linter

* linter 2

* fuel update

* Linter happy

* Lower stim effects requirements

* how did this happen

* fuck

* Nerf rad generation

* Add HFR to Yogsmeta

* Add HFR to AsteroidStation

* Add HFR to Gax

* Remove ghost atmos closer

* Add more radiation lockers on meta

* Update atmos areas

* Alt box HFR room

* Continue updating atmos areas

* Rename gas storage to foyer

* Maybe fix error

* important change

* Fix mix tank area

* Fix power cable on yogs

* Move meta scrubbers

* Add port to HFR on yogs

* Add better high mole broadcast and fix instant delam

* Add more fire extinguishers to incin on yogs

* Add extinguishers on gax

* Fix camera on asteroid

* Update asteroidstation

* Add more fire extinguishers

* Fix error

* Update gax

* Change asteroid toxins vent

* fix gax

* fix gax 2

* bring it back

* also this
2023-03-27 12:53:15 -05:00
Molti
c6b4b0ac9f fishin (#18343) 2023-03-24 21:59:21 -05:00
jachlompsky
f52b1c01e2 Beekit buff 2: electric beegaloo (#18217)
* Update beesease.dm

* Update miscellaneous.dm

* Update staff.dm

* Update staff.dm

* Update magic.dm

* Update uplink_kits.dm

* Update magic.dm

* Update staff.dm

* stinger projectile is a bee

* Update miscellaneous.dm
2023-03-24 21:54:55 -05:00
LazennG
13d785937b makes buster arm easier to use by turning it into a martial art (#18249)
* how long until a mistake is found

* test

* C

* Update code/datums/martial/buster_style.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/datums/martial/buster_style.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/datums/martial/buster_style.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/datums/martial/buster_style.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/datums/martial/buster_style.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/datums/martial/buster_style.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update buster_style.dm

* naming is too distracting

* what the fuck is examine_block and /n/

* Update code/game/objects/items/devices/busterarm/megabuster.dm

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>

* arg

* cd

* i

-bed no longer deletes itself in 10 seconds cause people can just resist to get out anyway
-throwing a target 0 meters and throwing while you shouldn't be able to should properly separate them from you now
-cant throw people who arent grappled anymore
-will work on the vending machine thing and probably grapple suplex lob thing tomorrow

* ignore that error

* Revert "ignore that error"

This reverts commit 9ad71c1eec.

* Revert "i"

This reverts commit e387df4fa1.

* Revert "Revert "i""

This reverts commit aaa9205ba4.

* fixed the slam thing

* vending machine menus no longer open on picking htem up

* you can examine now

* changes damage reduction to 50% from 65%

* OBLITERATES beds

* STOP BREAKING MY LEGS PLEASE THANKS

-wire snatch now just forcemoves you to the destination instead of making you risk a fucking hairline fracture by crashing into a person or the wall

* fixed animations most likely

---------

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>
2023-03-23 14:42:37 -04:00
ynot01
9c0341a814 Update psychotic_brawl.dm (#18273) 2023-03-17 12:52:10 -05:00
tattax
497bad63d3 fixes something (#18246) 2023-03-11 02:47:44 +00:00
Chubbygummibear
68e2ef0428 Add 4 quick action hotkeys to game preferences (#18174)
* action hotkeys done

* seismic arm actions instead of spells, revert this before actually doing action pr

* guh?

* Revert "seismic arm actions instead of spells, revert this before actually doing action pr"

This reverts commit 65a931495b.

* works

* dad said so
2023-03-10 15:55:41 -06:00
Uristthedorf
9e5bf92301 Buffs androids by giving them many things you would expect from a robot, and gives nanites. (#17929)
* Update android.dm

Make "holy androids" EMP proof

* Update rites.dm

Makes chaplain rite make holy androids

* Update nanites.dm

Allows anything that is both humanoid and robotic to get nanites, including synths and androids.

* Update android.dm

Adds NOZOMBIE and NOHUSK to androids because they're robots and should have these.

* Update android.dm

Adds more traits to androids. (Why could they take clone and toxin damage?)

* Cybernetic organs for androids

Gives androids cybernetic organs. (They used to be all organic except for the tongue.)

* Update android.dm

Removed TRAIT_NOCRITDAMAGE, because they shouldn't get stuck in crit forever.

* Update android.dm

Makes androids immune to toxin and cloning damage because they are robots.

* Update android.dm

Copies a bunch of stuff from IPC to make them more robotic, mostly cosmetic except for PROCESS_SYNTHETIC regent processing, and the meat/skin being added.

* Update android.dm

Increases android limb protection to match that of augged limbs.

* Removes holy androids

Making chaplain androids EMP immune should probably be a separate PR.

* Update nanites.dm

typo fix

* Update nanites.dm

Syntax fix

* Update android.dm

Fixes var

* Update android.dm

Fixes limb damage reduction

* Finishes making nanites available to androids.

Forgot to touch the other files.

* Update android.dm

Adds robotic brute/burn messages.

* Lets anything that isn't a silicon get nanites.

* Revert "Update android.dm"

This reverts commit f5fdc8dc81.

* Removed limb damage reduction.

* Adds NONANITES trait

I was told that you should check if a mob is a carbon before checking carbon traits. (I have not tested this but it compiles.)

* Update code/datums/components/nanites.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/datums/components/nanites.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

---------

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2023-03-06 21:54:00 -06:00
Mqiib
065e7dfff1 toxo0lysis (#18159) 2023-03-05 13:33:40 +05:00
LazennG
53f71dbe2e Buster arm patch 3: the unscammening (#18138)
* lets GO

* Update megabuster.dm

* slightly arbitrary

* mop still isnt working

* leaving it in a state where animations still work and going to bed since it's 3am

* works forreal this time
2023-03-05 13:22:52 +05:00
solwashere
927210d962 Update neutral.dm (#18142) 2023-03-01 21:49:47 +02:00
Molti
24cd216048 Starlight fixation tweak + Toxolysis buff (#18126)
* Update heal.dm

* Update heal.dm

* Update heal.dm

* Update heal.dm
2023-03-01 09:45:43 +02:00
ynot01
f89b2caa78 TRAIT_NOINTERACTION now refuses interaction properly (#18120)
* no interact

* say it to the user
2023-02-28 21:11:57 -06:00
Ling
c77594d110 SSmapping updates (#18066)
* A few SSmapping improvement

* sync1

* try 1

* remove print

* fixed1

* fixed2

* broken1

* fixed3

* use old reader

* clean up

* also remove this debug

* Don't load reebe and arena in low mem mode

* Latest version loader with mapgen fixed

* I missed this part somehow
2023-02-26 13:11:27 +00:00
SapphicOverload
0c850ffe06 Space-worthy helmets allow you to use internals without a mask (#17992)
* internals moment

* guh

* now requires mouth to be covered

* removes unnecessary comment
2023-02-26 14:56:14 +02:00
Molti
8aa8c8dc8a A few tweaks to nanite balance (#17858)
* Nanites changes

* Update weapon.dm

* Update weapon.dm

* Update weapon.dm

* Removes fake death

* stuff i forgot

* un nerf flesheating and meltdown
2023-02-26 12:33:24 +00:00
Molti
f95e76a3b1 Emagging an IPC gives them a random ion law (#17829)
* IPC ion law

* line break for readability

* Update hypnosis.dm

* span changes

* not permanent

* completely remove variable
2023-02-26 12:30:23 +00:00
ynot01
882a16013d Buffs changeling chameleon (#18002)
* super chameleon

* Update chameleon.dm
2023-02-25 23:32:48 -06:00
SapphicOverload
0beaaef532 MANKIND IS DEAD. BLOOD IS FUEL. HELL IS FULL. (#18039) 2023-02-25 23:30:02 -06:00
ynot01
ea70e3bbe9 [BOUNTY] Psychotic Brawl granter in uplink (#17882)
* psycho brawl uplink initial

* 8 tc and cant use stun weapons or disablers
2023-02-25 22:51:13 -06:00
Mqiib
4421655a59 change it up! (#17995) 2023-02-25 19:56:44 -06:00
ynot01
443d7fbab0 fix bhop whoops (#18036) 2023-02-22 20:59:28 +00:00
ynot01
a50254cc87 transcendent olfaction nerf (#17985)
* now here's the sniffer

* unchange sanguine
2023-02-20 00:20:03 -06:00
ynot01
33ffb77959 Fixes a bug where the Rod of White would become the Rod of Asclepius (#17976)
* fixd

* Update rites.dm
2023-02-19 20:27:13 -06:00
ynot01
2761924c1b pvp enabled (#17934) 2023-02-18 00:58:49 -06:00
ynot01
a4229d8acb [BOUNTY] Holy Light sect, dedicated to healing (#17924)
* you defy the light

* revive and be less bad flavor

* Update code/modules/religion/religion_sects.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

---------

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
2023-02-17 14:41:40 -06:00
ynot01
1d22d7da18 Long Awaited Psychiatrist Rework (#17721)
* PART FIVE

* Update brain_trauma.dm

* Update examine.dm

* Update mild.dm

* Update brain_trauma.dm

* Update brain_trauma.dm

* anomalous floating lightswitch

* undo unintended map changes

I am sorry I don't know what happened to asteroid station I don't know what changed on the AI satellite I am sorry mapper man

* can no longer cure things u shouldnt

wound traumas
traumas that require the aheal staff
traumas that come from quirks

* wej

* wej 2

* Update YogStation.dmm

* Update brain_trauma.dm

* Update brain_trauma.dm

* Update brain_trauma.dm
2023-02-15 15:11:07 +00:00
LazennG
4f4d2d8bbb cooldown actions isavailable now calls parent pro (#17889) 2023-02-12 16:51:19 -06:00
Molti
fef1aed09b IPC martial buffs (#17828)
* IPC martial tweak

* update the movespeed

* it's the mob that does it

* bit more uplink stuff

* no other guns
2023-02-11 17:14:42 +00:00
Ling
a737b7291e Fix a ton of harddels (#17803)
* Fix a ton of harddels

* Out of scope

* Stupid
2023-02-11 16:35:33 +00:00
Xander3359
402e2d775a One handed crusher (With new sprites) (#17778)
* 1-Handed Crusher

The crusher can now be held in 1 hand, wield it to use it.

* one-handed crusher

one-handed crusher

* Update dynamic.json
2023-02-11 16:27:38 +00:00
SapphicOverload
167ab6af2b Multilingual quirk can no longer give you centcom encrypted language and costs 2 points instead of 3 (#17735)
* guh

* Update good.dm
2023-02-10 16:43:55 -06:00
Redd
f13f241426 Revert "Removes felinid language (#17825)" (#17856)
This reverts commit e75cb0ad00.
2023-02-10 22:22:31 +00:00
Manatee
9f91e2edf7 les go (#17852) 2023-02-10 02:53:45 -06:00
Byemoh
4a6973a465 Falling into a chasm doesn't delete your body and someone can fish you up (#17723)
* eeeee

* e

* map

* break

* eeeee

* cope

* Update chasm.dm
2023-02-09 19:22:03 -06:00