Commit Graph

4411 Commits

Author SHA1 Message Date
Jordie a3f557ebc6 Merge pull request #42901 from optimumtact/regexshit
Hypnosis code improvements
2019-02-26 20:45:14 +11:00
Jordie d8b69235d8 Merge pull request #42791 from Mickyan/honkmeariver
Ends the Great Clown Shoes Debate of 2019
2019-02-25 22:19:45 +11:00
oranges fca3d16576 Hypnosis code improvements
Hypnosis no longer runtimes forever if it can't generate a valid regex
from the user phrase

Hypnosis also no longer constantly regenerates the regex and instead
just matches using the existing regex
2019-02-25 05:31:44 +00:00
ShizCalev a43c4acabc Fixes some minor speech replacement stuff (#42783)
cl ShizCalev
fix: Corrected slime mutation not correctly replacing the word douchebag.
fix: Fixed Elvis speech mutation inserting the word "getting" when saying "muh valids"
/cl
2019-02-25 15:01:28 +13:00
nero1024 327d8fbd40 fix footstep sounds from being played while buckled (#42788)
Fixes the crawling sound from being played from moving buckled/mounted mobs.
## Why It's Good For The Game

Apparently I didn't catch the crawling sounds being played from buckled mobs that are moving. Examples include the Janitor on their pimpin' ride or some assistant piggy-backing off of a cyborg.
2019-02-25 15:00:40 +13:00
Tad Hardesty 5fb918ebe4 Fix some variables with 'list' in the wrong place 2019-02-21 19:32:53 -08:00
Time-Green 3be9f4c165 removes double paraplegic (#42858) 2019-02-21 10:53:10 -05:00
ShizCalev e8630127f5 Fix junkie quirk (#42844)
Junkies will now spawn with their pills correctly filled with their appropriate
drug.
2019-02-19 22:11:33 -08:00
ShizCalev c1e77440b8 Fix neet quirk runtime (#42825) 2019-02-18 19:56:20 -08:00
Jordie 06fe123a34 Merge pull request #42785 from ShizCalev/deaf-disease-fix
Deaf disease fix
2019-02-17 20:55:52 +11:00
Jordie 5ccf30b50e Merge pull request #42795 from 4dplanner/crusher
Blood drunk eye fix
2019-02-17 20:04:57 +11:00
ShizCalev 77071fbc4b Fixes missing mutation arguments 2019-02-15 20:47:11 -05:00
4dplanner 32814aab11 CRUSHER MAKES YOUR ARMIES HARDER 2019-02-15 22:47:26 +00:00
Mickyan c7389a1ecd honk me a river 2019-02-15 16:07:19 +01:00
ShizCalev af2c950e04 Deaf disease fix 2019-02-14 23:08:05 -05:00
Shadowflame909 92113f7e9c Makes the Meteor Shuttle way more expensive (#42730)
* Update shuttles.dm

* Update shuttles.dm
2019-02-12 23:20:06 -05:00
Kierany9 14fa6040e5 Assimilation 2.0: Not quite a big enough PR to be worthy of the 2.0 title but almost (#42607)
* one

* ???

* big

* sprites

* it is done

* oofs

* no more bad jokes

* location -> reception

* i forgot a feature lmao

* yo lemme nerf this op power

* adjust removal and makes panic less insane

* hey i forgot another feature

* one mind removals

* *laser eyes meme*

* Disables multiple one minds for real this time
2019-02-12 20:02:23 -05:00
imsxz d5abf90113 pacifist antags retain pacifism (#42674)
* pacifism forever

* oops

* plan z can't possibly fail
2019-02-12 19:55:24 -05:00
granpawalton 7ebd0ad09b tweaks tissue hydration to meet description and holy water added to desc (#42745) 2019-02-12 19:53:55 -05:00
PKPenguin321 12f0ec568f [Ready] [Could Use Sprites] add Antenna and Mind Reader powers, paranoia disability to genetics (#42443)
* adds the antenna power to genetics
it gives you an innate radio

* adds paranoia and mind reader

* foil hat interaction, sprites, tweaks

* upstream change
never webedit, kids

* fixes conflict-fixing error
2019-02-12 13:21:07 -05:00
IndieanaJones 0937264f1e [READY]New Side Antagonist: Space Dragon (#42551)
* Add files via upload

* Rename space_dragon.dm to code/modules/events/space_dragon.dm

* Adds Space Dragon

* Adds Space Dragon Event

* Remove Copied File

* Put antagonist definition in proper location for space dragon

* Update space_dragon.dm

* Removed passive health regen from space dragon

* Updated Weight and Earliness for Space Dragon

* Added Objective to Space Dragon, Updated Starting Blurb

* Cleaned Up the Objective Determiner

* Actually fix the space dragon objectives

* Fix the objective display for the space dragon's target

* Updated Space Dragon Intro Blurb

* Updated Centcom Message When Space Dragon Spawns

* Updated Space Dragon's description with new lore

* Clean Up Space Dragon's OnFire()

* Add Space Dragon Sprites

* Sprite in wrong location

* Properly adds Space Dragon Sprites

* Adds Space Dragon Tiny Sprite to be Carp

* Space Dragon Uses New Sprites, Tiny Form Updated

* Increased Time Til' Dragon Spawn

* Drake's Tail Sweep Now Uses Prebuilt Spell

Thanks to Cobblestone for the head's up on this.
2019-02-10 21:12:17 -05:00
Time-Green acfd3f8253 [GOONETICS] Chromosomes (#42151)
* adds chromosomes

* Makes the framework nice and functional

* Adds chromosome interaction

* Makes chromosomes work

* removes the double instability update

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* more review stuff

also fixed some inconsistencies in chromosomes

* unfucks defines

* Fixes saved mutations runtiming with empty pods

* Adds stability to the dna console and advanced health scanner

* removes a random bug i stumbled upon

* Update code/game/machinery/computer/dna_console.dm

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* makes chromosomes harder to get

fixes double mutations, adds reinforcer and nerfs stabilizer

* fixes edge case where fireballs would be harmless

* cleans up find/replace all mess and 1 in 10 trillion chance of fireball breaking
2019-02-10 20:45:09 -05:00
nero1024 e949346cfd Fixes footstep sounds for downed/lying mobs (#42704)
Nobody made a report but I noticed this issue: Downed players being dragged are playing footstep sounds, specifically the bare footstep sounds via their hands from what I noticed.

Fixes (hopefully) footstep sounds from being played from incapacitated mobs that are being moved (via dragging for example). Instead, lying mobs will play a crawling sound when moving.
## Why It's Good For The Game

Footstep sounds shouldn't be played when mobs are being dragged.
2019-02-10 12:43:55 +13:00
Vile Beggar 313db3ad8b Tweaks the drill hat to be a bit less annoying (#42655)
* does the tweaking

* indent fix

* adds more canadian variety

* no longer mr politeman

* adds cobby's review suggestion

* gets rid of mutation defines

* makes it use speechmod

* removes accidental letters

* gets rid of unneeded comma in .json

* changes magic number into defines

i hope it's supposed to be like this

* compile fix

* gets rid of yelling define in dna.dm

* removes unneeded line in .json
2019-02-09 22:26:49 +11:00
tralezab 43ecae6fa2 sleeping carp now deflects projectiles in random directions (#42647)
* bad ass shit

* durr

* nice

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>
2019-02-08 11:56:25 -05:00
tralezab 46e3894bb2 Creep fluff completely rewritten (#42675)
* hang in there!

* Apply suggestions from code review - rewrite P1

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>

* most creep > obsessed - rewrite P2

* removes creep_inlove, last edit to greet
2019-02-08 11:26:41 -05:00
PKPenguin321 cefe4a6a51 [Ready] Adds 5 new negative/minor negative mutations, mutation conflict system (#42524)
* adds 5 new (minor) negative mutations
also adds a mutation conflict system

* removes debug comments and to_chat(world)s

* addresses reviews

* further review addressing, new message
and a message given to the subject when a mutation fails to manifest because of conflicts

* cooldown on acid flesh message
2019-02-07 23:08:29 -05:00
Vile Beggar d13420801b Properly adds a Janitor ERT (#42659)
* does the thing

* adds the regen thing to the sprayer

* adds a quite important addition to a comment

* capitalizes janitorial response

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* adds cobby's process suggestion
2019-02-06 15:56:31 -05:00
Militaires cecf676684 [Ready] Outputs datum (#41535)
Idea and instructions by @Razharas, many thanks.

This PR only implements the framework required to catalog as well as play the sounds. Their to_chat text, and icons (if any) are not included, are to be pushed in a separate PR.

This PR does not remove the old playsound_local system, it is kept for the sake of not necessitating a direct changeover of every single playsound in the code, which will surely cause a lot of merge conflicts. It does however, replace bike horns' and toy nukes' means of playback to this datum, purely as proof of concept.

Playsound_local may remain in the code to support playback of admin-uploaded sounds that do not have an inherent datum. Playsound will likely be renamed to something else in the next PR to reflect its new, more universal function. We will see.

New process for adding sounds:

    Create a new datum/outputs subtype.
    If you wish, write down some supporting text; this gives further meaning to the sound.
    Add multiple sounds to the sounds list, and weight them as you wish. (New)
    Add a sound icon if you wish, it defaults to a generic sound circle anyways though.
    playsound(/datum/outputs/new_subtype, receiver), and it will deliver, icon, sound, and text to the receiver.

Maintaining implication is that from now on playsound should only be processing datum/outputs

This pr intends to gut to_chats that are added alongside playsounds in the code.
This pr eliminates the need to initialize sounds in a list so that you can weight them or have the game play them randomly from the list.

Sound Rings
Currently, only mobs with the audiolocation var may view them. Sound icons have an alpha that depends on the volume of the sound, louder sounds create a more opaque image

Sound rings are completely modular and may be changed to any image.

In addition to renaming playsound to reflect its new function. I intend to give blind people sound icons at the cost of their small view, but that is for another PR.

cl Basilman
refactor: refactored how sounds are stored and played
add: Added sound rings and supporting text
/cl
2019-02-04 10:25:48 +13:00
ShizCalev f09b0e7b44 fixed pronouns 2019-02-02 19:16:59 -05:00
Nirnael 2509decbc9 Fix tourettes function overload (#42592) 2019-02-01 12:25:35 -05:00
coiax 2ed34af9c0 Adds Paraplegic quirk (#42503)
🆑
add: Adds the Paraplegic quirk for -3 points. You start with unhealable leg paralysis
(persists through cloning), and have a wheelchair to move around the station.
/🆑

This is really popular for some reason.

This required a surprising amount of small code tweaks for it to "feel"
right in edge cases like being a job that had items in their hands or
joining on the arrivals shuttle.

Justification for -3 points: You move REALLY slowly, in a game that's
about generally running from security/the guy with the esword. And if
you die and get cloned and don't have your chair, you move even slower.
2019-01-30 12:08:54 -05:00
coiax e65e50e8d9 Traumas are copied when a person is cloned (#41852)
* Traumas are copied when a person is cloned

🆑 coiax
add: When a person is cloned, any mental traumas are cloned as well.
/🆑

If the cloner is going to recreate your delicate personality, it's going
to have to recreate anything wrong with your brain as well. After all,
where does one greytider's legitimate fear of security end, and another
one's irrational fear begin?

Essentially, traumas could be easily gotten rid of by cloning, or death
would rob a person of a rare positive trauma. Now you're stuck with them
until you get rid of them.

* Suggested changes
2019-01-30 11:36:20 -05:00
Jordan Brown 84a1b0cd6c Merge pull request #42586 from 4dplanner/antimagic
Antimagic works again
2019-01-30 11:33:48 -05:00
tralezab 1733858ba8 [Ready] Happiness drug overdose has special mood icons, badass syndies get sunglasses on their moodlet, creeps get heart eyes (#42502)
* mood_event.dm

* runaway - kanye west

* didn't take forever debugging how nice

* fixes and sanity

* moods are fun
2019-01-30 22:44:54 +11:00
Jordie dc4933012a Merge pull request #42464 from BuffEngineering/forth-times-the-yeah
Adds welding hardhats
2019-01-30 22:35:53 +11:00
4dplanner 7ad8fa48c6 ?. 2019-01-29 18:34:48 +00:00
Rob Bailey 08afd120f4 [Ready] Smoker and Junkie Quirks (#42477)
* drug quirks

* more work on junkie trait

* more druggie work

* work pls

* make the junkie trait actually fucking work and not runtime

* fix the smoker quirk

* fix capitlization on the reagent containers

* refactored

* less shitcode

* fix errors

* add meth and crank since it's 0.5u

* fix dupe chem + fix addictions list being loaded with null

* relapse mechanic

* have addiction applied on spawn again

* remember to compile kids

* some logic error corrections

* fix another logic error resulting in relapses never triggering

* fix the logic error that I thought I fixed to begin with but accidentally made worse

* I really have the fucking dumb right now.

* reset the addiction when it's readded

* better syntax for list addition

Co-Authored-By: actioninja <actioninja@gmail.com>

* suggested changes

* better new syntax

Co-Authored-By: actioninja <actioninja@gmail.com>

* turf var

* correct syntax error

* renamed vars

* announce proc instead of hacky logic

* clearer logic refactor

* increment operator

Co-Authored-By: actioninja <actioninja@gmail.com>

* make it actually compile

* no null patrol

* fix accessory spawning

* fix runtime from the reagent list being full of instances apparently

* buff pill contents so they actually satisfy addiction

* adds cigars to the smoker spawn pool

* I think this is what cyber means?
2019-01-29 10:11:13 -05:00
4dplanner 7a707d3c8f ! 2019-01-29 13:11:04 +00:00
4dplanner 89ded4fc4d Antimagic works again 2019-01-29 12:40:02 +00:00
Name 004792ba05 Rebase due to mime trickery
Cuts something that should be there


hardens pp


largens pp further


maximiezes pp 


fixes code


Auto stash before merge of "forth-times-the-yeah" and "BuffEngineering/forth-times-the-yeah"
Adds Initialize()


First Draft

Mostly works
Removes redundant code, adds other colors, adds to CE locker


oops forgot to


hardens pp


maximiezes pp 


Adds Initialize()


Auto stash before merge of "forth-times-the-yeah" and "BuffEngineering/forth-times-the-yeah"
oops forgot to


Attempts to balance the hardhat, adds to EngiDrobe


Removes unnecessary code and sprite, adds necessary sprite


How can commas be real if our eyes aren't real


Fixes bad slash


Fixes runtime


Optimizes code after runtime fix


Removes redundant code


Fixes 3/4


*scream


Makes visor coverage consistent with new sprites


Actually fixes the issue


samus? its an honor


Makes requested changes


Doesn't delete welding hardhat sprites
2019-01-28 16:28:40 -05:00
Time-Green 442bfdeca5 changes geladikinetic creation to geladikinesis
honestly its a mouthfull
2019-01-28 15:13:32 +01:00
Vile Beggar c98d9d054b Properly adds a drill sergeant hat to the warden's locker (#42533)
* does the thing - please work

* adds it to the locker

* remove var/datum

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* Update code/modules/clothing/head/jobs.dm

adds space

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* adds denton's review suggestion

it's a webedit but i tested it and it worked

* makes it a bit less annoying

* grammar fix
2019-01-28 03:10:57 -05:00
4dplanner 87ba21090c Megafauna cannot teleport (#42479)
Megafauna cannot teleport
2019-01-25 10:17:54 -05:00
PKPenguin321 1ab0c127dc [Ready] Adds a new power, Transcendent Olfaction, to genetics (#42414)
* adds Transcendent Olfaction to genetics
codersprite by me

* fixes
made messages work, added a new message
removed duplicate icon

* uses disgust instead of oxy damage

* addresses review
mostly changing usr to user. global mob list -> global carbon list since that's what i parse for anyways.
also changed a message.

* makes it compile
2019-01-25 03:35:50 +11:00
Time-Green 9861efde71 Cryokinesis and Geladikinesis mutations (#42453)
* Adds cryokinesis and renames the cold resistence file to space adaptation

* adds cryokinesis

* fixes icon conflict

is there actually a proper way to fix them thats not copying master and reimplimenting your own sprites?

* fixes a typo and lowers instability of cryokines by 5

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* maybe reverts line ending?

* unfucks flags?

* probably unfucks line endings

i swear to fucking god why does it even do this. i never even touched the file and reverting it to master doesnt do anything. fuck you git
2019-01-23 15:20:56 -05:00
Trilbyspaceclone 555f0bda23 Fixes power tool drill fitting in boots/wallet (#42476)
* Update wallets.dm

* Update pockets.dm

* Apply suggestions from code review

For when people forget how sister code works

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-01-23 14:32:04 -05:00
4dplanner ea4234cd81 legion cores remove CC instead of adminhealing [READY] (#42378)
* legion cores remove CC

* legion -> regenerative

* lore

* Icons

fixes last reference to legion core in status

* Automatic creation of classes is possibly the worst feature of all time

* Moves remove_CC

* Review changes
2019-01-22 11:57:53 -05:00
tralezab b7c5559146 [READY] fixes roles that shouldn't be creepy being creepy and the jealousy objective asking you to assassinate the obsession + missed sanity (#42389)
* adds station positions global list

* She don't believe in shootin' stars But she believe in shoes and cars Wood floors in the new apartment Couture from the store's department

* missed comma

* embarassing

* Update code/modules/antagonists/creep/creep.dm

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>

* parentheses

* shiver me timbers

* Hey, great work Mac! Now let's take down the next circuit!

* a plethora of fixes
2019-01-22 22:15:02 +11:00
PKPenguin321 a918476cf4 Two new electric powers for genetics (#42437)
* two new electric powers to genetics
Insulated - innate insuls
Shock Touch - Electric punch!

* fixed shock touch mutation and buffed it
also made it use electrocute_act() instead of flat burn damage, much nicer now
also added some vars to touch spells to let you set the draw/drop messages

* better internal logic
electrocute_act already checks for SHOCK_IMMUNE, so i dont need to do it
2019-01-22 22:06:29 +11:00