Commit Graph

117 Commits

Author SHA1 Message Date
AnturK
e3fca45a78 Fix a few small runtimes (#49352)
Nothing special here, mostly sanity.
Defib hud is awful, needs rewrite.
2020-02-16 00:40:11 -08:00
itseasytosee
870a6e5bbd [READY] Omega soap (#49265)
* Omega soap

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

Co-Authored-By: swindly <swindly_tg13@aol.com>

Co-authored-by: swindly <swindly_tg13@aol.com>
2020-02-10 20:03:29 +01:00
skoglol
a28b24f149 Completely removes cloning (#48668)
* Removed from code

* Removes cloners from maps

* Some more references, now compiles.

* Reduces availability of replica pods

* DNA scanner and tech disk rebranding

* pubby door name, cargo pack description
2020-02-04 16:04:06 -05:00
RaveRadbury
8b19d797ca [Ready] Prisoner role (#48819)
About The Pull Request

I observed someone request to be perma'd round start and then they just chilled in perma the whole shift. Security isn't always going to be up for putting people in perma and players who have been placed in perma tend to go catatonic. This allows players who are interested in having a chill shift doing the stuff in perma and acting like they've done crimes the opportunity to do that.
Why It's Good For The Game

Crew content. I'm not saying it's mindblowing but if we add it in as a role it will open the door for people to look at perma and what could be done with prisoners.

Prisoners spawn with a prison ID, a jumpsuit, and shoes. They are also currently spawning with a backpack and I'm uncertain about whether or not I want to do anything with that.

This is ready for a testmerge and worked for me locally.

Thanks to Tralezab for assistance with merge conflicts.
Thanks to EOBGames for the plasmaman prisoner sprites.
Thanks to Quill-Weave for encouragement.

Feedback is of course welcome, and I'd appreciate suggestions re: balancing this role. Maybe they should be roundstart pacified or something.
Changelog

cl
add: Adds prisoner role
/cl
2020-02-03 09:54:03 +13:00
skoglol
d33b46bb37 Light step quirk rebalance (#49059)
* Light step rebalance

* null check

* Reduced cost back to 1
2020-01-29 13:46:51 -05:00
QualityVan
03f74c5d0e fixed addiction getting reassigned mid deletion (#48942) 2020-01-23 12:51:31 -05:00
skoglol
feecf28fa5 Merge pull request #48616 from cacogen/wayfindingpinpointers
Fixes wayfinder dispenser sprite/lowers amount of pinpointers from it/adds pinpointer recycling
2020-01-17 10:58:27 +01:00
cacogen
90fe68763d Less wayfinder pinpointers from dispenser 2020-01-17 12:28:01 +13:00
AnturK
bca492823a Runtime fixes: Episode 113 (#48814)
* Fixes mood nanite settings

* Fixes yet another quirk runtime.

* Ugly paperplane fix

* Abductor armor runtime.

* cablecutting runtime

* Nukeop death runtime (were those spec deaths meant to fire on gibbing too ? )

* headpike runtime fix

* ERT outfit runtime

* bonfire oxygen runtime

* Rest of nanite updates
2020-01-16 11:16:37 -05:00
cacogen
3418be2e16 kriskog changes 2020-01-05 16:43:47 +13:00
cacogen
570ddb50f1 Adds beacons to Meta
- Wayfinding beacons now try to grab their location from any airlock they're under first, then their area, if it hasn't been set on the map
2020-01-05 16:43:47 +13:00
cacogen
29104ccc1e Navigationally Challenged quirk
Spawn with wayfinder. Automatically given to clients less than 7 days old.
2020-01-05 16:43:47 +13:00
cacogen
c963b542f0 Kong whiskey and candy corn liquor (#48263) 2019-12-28 15:20:06 +01:00
81Denton
3a0c5e75b3 Adds a new job: the Paramedic (#48236)
* Adds a new job: EMT

* adds code

* either adds or removes code, hard to tell at this point

* Never not on it, leanin' so hard you're ashamed
You can't dismiss this sick transmission, huffs your brain
Exhale your will and forget I ever knew you
Fuck do you do?
Fuck a man with hips for hulu
Rack a snitch, chalk and cue you
Corner pocket consume you
Too many hoes in my
Too many hoes in my motherfuckin' meal
Asking if I know how a motherfucker feels
How a motherfucker feels

* 300 hours in MS Paint

* map editing is almost as pleasant as CBT

* remove crepe

* indentation

* map merge

* crew pinpointer, EVA access

* sick sprites by twaticus

* Replaces pen acid bottle with calomel

* Moves crew monitor/pinpointer to premium

* Triple six, five, forked tongue
Subatomic penetration rapid fire through your skull
How I shot it on one taking it back to the days of trying to lose control
Swerving in a blaze of fire, raging through my bones
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah, I feel like killing it Takyon
Alright that's tight, what its like to experience Takyon
Out of the blue, in through the back
Door coming through like fuck what was that
Man I don't know, but it made me feel so heated
How we creep without showing you jack
Shit from below, give a shit if you know
'cause even if you did, you'd keep coming back
Back for more, need it man you're addicted to the heat
We make beats catch
Beat it til it bleeds to death, each track
Like EPMD snappin' necks as we tap energy
From everything on and off the map
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
Takyon, shot down your throat like a keg of beer
Choke on the smoke we in and exhale 'til the whole chamber is clear
Haters act so fucking weird
Try to stain this atmosphere
But they can't 'cause its way too sheer
How to make a hater disappear
Take shit where it ain't never been
Fuck what you thought could not comprehend
This shit if I fisted your brain with it
10-9-8-7-triple 6-5-forked tongue
Criminal level crunk lightning storm
Get out the way or get up torn
Ain't a picture big enough to fit
What we dig up from the core
Of all that they forgot ever was
Militant march of this war
Takyon taking them down
All we see is blood
Takyon turning them out
How to trick out and freak that buzz
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
Lunar eclipse forcing you to trip
Off the moonlit fire we spray
Cryonic haunted bullets hollow tipped with toxic waste
So here's the deal, if you don't feel ill
Don't want it nowhere near my zone
That shit is dead, can't nobody get
With that shit gets dial toned
Takyon bitch slappin pussy clots and clones
Takyon settin' off uni bombs inside your dome
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon

* YUH

* Updates sprites

* changes job order, uncomments plasmeme clothes

* Updates outfits

* last commit I swear

* bottle descriptions

* Renames EMT to paramedic

* Renames existing EMT clothes to paramedic as well

* Add missing job icons for Paramedic (#9)

SecHUD icon
ID card icon

* Improves descriptions

* Reverts vending balance change, replaces random spaces with tabs

* Resolves map conflicts

* Update strings/ion_laws.json

Co-Authored-By: BadSS13Player <58376109+BadSS13Player@users.noreply.github.com>

* Adds missing pda_slot to the paramedic outfit

* roller bed starting equipment

* Fixes map conflict

Co-authored-by: JJRcop <jrubcop@gmail.com>
Co-authored-by: BadSS13Player <58376109+BadSS13Player@users.noreply.github.com>
2019-12-27 10:29:12 -05:00
RaveRadbury
db3faf7ff0 Fixes mime pins, clarifies quirk descriptions (#48367) 2019-12-23 23:22:04 -05:00
Emmett Gaines
5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
RaveRadbury
daf3db97de [READY] Social Service Mood Boosts Part 1: Clown and Mime Fan quirks (#47254)
* Adds mutually exclusive Clown and Mime Fan traits based off of Spiritual quirk

* Adds positive moodlets for sitting in rooms, adds pins and moodlets for pins

Need to figure out why the progress bar for being buckled doesn't show up.

* I forgot that Spiritual is 1 point.

* Reverts examining for mood boost and room mood boost events
2019-11-02 19:34:00 -04:00
nemvar
39f6d36d5a Minor fuckup fixed. Comment readded. 2019-10-19 14:48:58 +02:00
nemvar
1ca1e9c6d1 Smoker runtime fixed once and for all. 2019-10-19 14:47:33 +02:00
Qustinnus
26a95ac867 Re-adds room beauty without the negative moodlets (#46848)
* re-add

* epic

* fix

* epic
2019-10-05 22:47:49 -04:00
Names Are Hard
057be7fdf2 Adds phobias as roundstart quirks (#46524)
* Phobia as quirk

* Changed value

* Valueless again

* Moved to neutral

* Actually gives trauma roundstart
2019-09-27 00:26:51 -07:00
Mickyan
e9116fcace Moves drunk healing to quirk process (#46507)
* drunk coding

* removes redundant check
2019-09-15 19:00:11 -04:00
Mickyan
f2c80d5bec Inhands for photo albums (#46404)
* inhands, grammar fix

* that's not how books work
2019-09-09 22:13:03 -04:00
Fikou
ee6a423421 chap and gene heirlooms (#46225) 2019-09-03 00:03:41 -07:00
bgobandit
c606522bec Non-tagger graffiti counts as bad art (and other art adjustments.) (#46248)
About The Pull Request

    Non-taggers' graffiti counts as bad art. Taggers' graffiti counts as good art, not great art.
    Makes the art defines global defines and removes some magic numbers.
    Re-orders the switch statement for art to go ascending instead of descending, because otherwise if something is at BAD_ART it will register as good instead, if it's at GOOD_ART it will register as great, etc., which defeats the purpose of having defines.

Why It's Good For The Game

The tagger component: Because there isn't really much bad art in the game ,and graffiti is as obvious a candidate as any, and gives the janitor an actual excuse to remove it besides being a dick. If you don't want the potential for a bad moodlet, don't examine the art. You have to go out of your way to do so anyway.

Very slightly nerfing tagger graffiti: Because "what a thought-provoking piece of art" is kind of much for graffiti.

The other component: Because there's no point in having defines if people are just going to put magic numbers everywhere anyway. (I left the impressiveness numbers for statues, etc. alone, because those can take damage, dropping their quality. But if something can't take damage, just use the define.)
Changelog

cl
tweak: Graffiti by a non-tagger counts as bad art.
/cl
2019-09-02 09:17:41 +12:00
wesoda25
acfcb5cbd7 Removes Cigars from Smoker Spawn Pool (#45883)
* smokesmoke

* ooob

* Update negative.dm
2019-08-23 17:11:37 -07:00
Mickyan
a5b04e360c Adds more persistent photo albums (#45898)
* album

* more slots

* new icon for old photos
2019-08-17 00:42:58 -07:00
RandolfTheMeh
48fbc073e5 [TMC] Defib Rework, Organ Damage Effects (#45104)
* Brain damage works on organ damage procs, some defib reworks

* Heart and Lung damaging effects and failure, liver damage and failure moved to its organ again

* Cleans up reused global

* Organ damage procs on living and living/carbon

* Changes brain damage procs again

* SR heals all organs on revive, no decay for cybernetic implants, stomach damage and fail effects.

* Damage and failure effects for the appendix, ears, and some touchups on the stomach

* Committing changes so I don't lose them

* Organs now cease decaying in the proper containers

* Organ Fridges

* Reverts map changes

* Adds coronary bypass, lobectomy, trying to deal with organ_stat runtime

* Actually fixes merge conflict

* Smartfridge tweaks

* Think I figured out map merger

* Evidently not

* Still runtiming with glass shards even after I remove the map changes?

* Fixes runtime error with brain_item

* Runtime fix on living/carbon/life

* Cleaning up old PR code

* Brain damage fix, moves defines to actually be in _DEFINES, under DNA since that's where organ slots were

* Wrong math operation used

* Brains in MMIs no longer decay

* Removes redundant variable, and defibs no longer work on heart attacks caused by failing hearts

* Removes misleading comment

* init freezes organs in case organ crates are added, morgue corpses are frozen, removes adjustLiverLoss

* Removes random spaces, scanners check brain damage severity now

* Swaps numbers for defines, fixes brain surgery, rebalances coronary bypass bleed since that was insane last I tested it

* List change

* Runs off of an index instead of using cut

* Brains can be put into organ fridges

* Fixes minor type, hotfix for cloning problem

* Removes pointless check

* Demon hearts no longer decay

* Nightmare hearts no longer decay

* Removes istype() check on process, sets can_decompose instead

* Condenses organ damage report

* Removes organ failure messages

* Less organ damage spam, implements organ threshold messages instead

* Brain damage messages go to owner, not source

* Self-examine shows damaged organs

* Minor code cleanup, adds autodoc comments to the new procs

* Inverts standard organ vars to prevent random organs decaying, adds a few more autodoc comments.

* Merged the booleans into a set of flags

* Healthy living improves organ healing rates

* dunno why this didn't update

* my actions have consequences

* Sets ORGAN_SYNTHETIC for overlooked robotics organs

* Doubles heart decay time

* 3 minute heart decay

* Lobectomy/Coronary_Bypass heal more

* removes hivemind spells from the changes
2019-07-29 02:18:22 -07:00
Rob Bailey
c62b789bb3 Refactoring and runtime fixes for junkie and smoker (#45394)
* Revert "Revert "refactors + fixes""

This reverts commit b87884f4a3.

* small fixes
2019-07-26 13:43:24 +02:00
actioninja
b87884f4a3 Revert "refactors + fixes"
This reverts commit 5ed2e36d80.
2019-07-22 23:30:23 -07:00
actioninja
5ed2e36d80 refactors + fixes 2019-07-22 23:29:17 -07:00
Mickyan
1b8ed8b6b8 weak (#44894) 2019-07-10 19:58:59 +02:00
Garen Crownguard
534a9140aa merge 2019-07-05 17:59:38 -05:00
XDTM
d70c43c5f1 Checks for metabolization on some has_reagent (#44653)
About The Pull Request

Stuff that should logically require you to actually be metabolizing the reagent now requires a liver, or the reagent to not need one.
Some reagents have been granted self consuming status, like holy water, since their effects are not tied to the metabolism.

Fixes #44650
Fixes #43024 since there should be no real way to mitigate the constant toxin damage now
Why It's Good For The Game

Less exploits with livers, more consistency in mechanics.
Changelog

cl XDTM
fix: Viral healing symptoms that are tied to reagents now also require a functioning liver to work.
tweak: Holy water, Pyrosium, Cryostilane, Napalm and Phlogiston no longer need a liver to have their effects.
/cl
2019-06-29 21:08:38 +12:00
Garen Crownguard
3a37d0322c merge 2019-06-23 20:39:24 -05:00
AnturK
ec97bbceee Fixes musician quirk runtime without backpack. (#44703)
* Fixes musician quirk runtime without backpack.

* copypasta mistakes.
2019-06-22 01:43:01 -04:00
nemvar
c44120b5d1 Adds bee plushies (#44342)
* Adds beeplushies

* makes the behind less pure black

* Newline
2019-06-07 13:55:02 -04:00
Nalzul
47700b8679 Allows you to wear the caution sign + new sprite for the caution sign (#44289)
* +Sprite +Repath

* Adds 5 brute armor
2019-06-04 11:48:47 -04:00
Emmett Gaines
c3f95024b2 Gets rid of the GetComponent macros (#44220)
* Removes the GetComponent macros

* Regex replacement for GET_COMPONENT

Search: `GET_COMPONENT\( *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = GetComponent($2)`

* Regex replacement for GET_COMPONENT_FROM

Search: `GET_COMPONENT_FROM\( *(.+?) *, *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = $3.GetComponent($2)`
2019-06-04 17:39:58 +02:00
Garen Crownguard
caa683e5b1 merge 2019-06-04 07:04:21 -05:00
Garen Crownguard
4b2fc4cc05 Removes Hygiene 2019-06-04 06:25:51 -05:00
kingofkosmos
1bf60bbe06 Adds missing </span>'s. 2019-06-02 21:29:14 +03:00
vuonojenmustaturska
6a106bc877 Remove reagent ids and use typepaths where applicable (#44166)
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
2019-05-31 21:57:26 +12:00
oranges
1f204cf008 Merge pull request #44172 from wesoda25/bruhmoment
Removes Physically Obstructive Quirk
2019-05-30 21:05:16 +12:00
wesoda25
6a71ec923a Update negative.dm 2019-05-27 23:38:03 -04:00
RaveRadbury
7c9576c6e2 Puts medical record quirks in Medical Record "Important Notes", gives each quirk a medical record, cleans up subjects into patients. (#44009)
* Gives each quirk a medical record, cleans up subjects into patients.

* Update code/datums/traits/good.dm

adds a period I missed

Co-Authored-By: loser <loser@nonagon.host>

* Dumps medical quirk string into medical "Notes"

* Implements bgobandit's suggestions

* ~Comma, comma, comma, comma, comma, commits from Cobby~

Also I missed an A.

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-05-24 12:45:33 -04:00
RaveRadbury
9ab2ad72ca Reworks "Religiously Comforted" mood_event (#43995)
* Initial poking around

* adds a message to let you know the examine proc'ed

* converts time to minutes

* removes old on_process() code

* Nests procs under if(!appears_dead)

* nests blocks under src != user
2019-05-21 18:53:13 -04:00
Mickyan
3b5c9b5a34 [READY] Moves mood quirk checks to their respective quirk process (#43845)
* quirk process

* does the same for hygiene

* un-breaks miasma generation

* so how's your day going
2019-05-12 10:52:25 +12:00
vuonojenmustaturska
fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
Mickyan
268316731f [READY] Adds the Empath and Friendly quirks (#43651)
* things

* newliiine

* better text
2019-04-23 15:00:14 -04:00