Commit Graph

639 Commits

Author SHA1 Message Date
81Denton 1c4036b309 [TMC] Explosion rebalancing (#45819)
* megumin is best girl fucking fight me

* what kind of smoothbrain capizalized these

* uses explosion defines

* more explosion defines

* Removes reagent explosion code for <1 amounts

* Scales explosion knockdown off bomb_armor
2019-08-14 10:55:50 -04:00
tralezab b5de31638d You can no longer name some things after words in the ic filter (#45696)
* quick sanity fix

* more things i found

* better list used, updated comment
2019-08-11 18:33:39 -04:00
Akrilla 9ca37e9169 Contract rerolls and general enhancements (#45703)
* refactor wip

* rerolling and qol

* space not valid

* travis be nice

* comment?

* new tablet sprites

* Start on uplink screen

* new suit sprite

* paper

* merge conflict

* Auto stash before merge of "contract-reroll" and "tgstation/master"
2019-08-10 02:11:11 -07:00
ATH1909 0b1579af08 Changes the Disintegrate spell's name to "Smite" (#45786)
* Update godhand.dm

* Update touch_attacks.dm

* Update spellbook.dm

* Update spellbook.dm

* Update godhand.dm

* Update touch_attacks.dm
2019-08-09 15:06:06 -07:00
nemvar 02251be5ac Turns Gibberish code into something that's not gibberish (#45753) 2019-08-09 11:32:32 +12:00
oranges d3a52cbd71 Merge pull request #45763 from kriskog/effects
Removes cameras reliance on icon default state
2019-08-09 11:31:51 +12:00
81Denton 7b8579c17a Minor ghost notify changes (#45759) 2019-08-08 01:47:04 -07:00
nemvar 269c7666fc Nerfs reinforced bolas (#45622) 2019-08-07 16:00:34 -04:00
kingofkosmos c3ea51908d Adds "you" to local visible_messages (#45631)
* adds "you" to some combat visible_messages.

* more you-messages and attack verbs to present tense.

* small fixes

* more additions and small fixes

* few message tweaks

* Fixes a typo and few other wordings.
2019-08-06 02:15:34 -07:00
Tad Hardesty 009dbfc7cc Fix broken suits in medical outfit lockers (#45695)
* Fix broken suits in medical outfit lockers

* More dumb ass fixes
2019-08-05 18:57:35 -07:00
ishitbyabullet 71277af9d3 Improved Cabin Away Mission (#45618)
* The map itself

I hope it won't PR on /tg/station immediately.

* ok lavaland monster dmi thank you

"bruh you added two sprites oh shit im about to m-m-m-malfuncti-" *BOOM*

* cabin building stuff

Still need to merge master.

* Ninja's uniform PR got merged.

Good thing I used, like, only one jumpsuit for the entire map. I hope this merges before someone changes winter coats though.

* lmao

* MrDoomBringer forgot a few things

obj/iced_abductor. that's an ayy lmao moment.

Besides that, the block should work. Just don't destroy it before the round begins otherwise you see this: https://i.imgur.com/K3GGnqy.png

Proof that this works: https://i.imgur.com/MxVO0Og.png

* no more claustrophobic medbay

It doesn't look as good as I want it to. It also feels way too fucking cramped.
2019-08-05 01:37:11 -07:00
skoglol 394066caab Removes cameras reliance on default icon state. 2019-08-05 05:22:28 +02:00
nemvar e587b970da Adds parent calls to almost all tool_acts (#45582)
* Adds parent calls to almost all tool_acts

* actually compiles
2019-08-03 22:25:57 -07:00
nemvar 42aa3df3ec Clean up imp code (#45670)
Who would have guessed that unmaintained code is unmaintained. Imagine 
my shock.
2019-08-03 19:10:14 -07:00
Rob Bailey ea6c11d1b9 Merge pull request #45537 from bgobandit/spellingiseasyidk
Various spelling, grammar, and text changes.
2019-07-31 02:40:02 -07:00
Rob Bailey 6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
Rob Bailey 1a24447a82 forced doesn't trigger spam detection (#45571)
* eminence

* imaginary friend

* blob overmind

* say
2019-07-30 19:08:08 +12: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
Garen Crownguard 58b5819be0 Fixes infinite loop when you catch a cult bola (#45492) 2019-07-28 17:58:35 -07:00
bgobandit a0a7d0ff33 Disguised syndicate saboteur cyborgs now use the regular cyborg bubble_icon. (#45515) 2019-07-28 17:56:28 -07:00
Garen Crownguard e851b6550a Cult hoods can be toggled (#45497)
* Cult hoods can be toggled

* oops
2019-07-28 05:00:50 -07:00
Akrilla 9df1854c20 Tweak contract roundend text (#45506)
Moves buys and (used X Rep) on same line
2019-07-27 20:21:59 -07:00
bgobandit a53d7d38d4 what has become of my life 2019-07-27 21:54:12 -04:00
Suicidalpickles 1dbe76fcdc changes rev deconversion text color (#45480)
* color change

.

* puts span back

* line suggestion change

Co-Authored-By: ShizCalev <ShizCalev@users.noreply.github.com>
2019-07-27 02:25:20 -07:00
Akrilla 7fbe4c0bac Contract extraction doesn't strip borgs (#45470)
* dont strip borgs

* yikes

* indent
2019-07-26 17:57:41 -07:00
skoglol 718973fb9f Removes the assimilation/hivemind gamemode (#45316)
* Initial pass

* comment.

* stray ,

* stray define begone
2019-07-27 00:08:53 +02:00
nicbn 44a07d712d BoH bombing rework II (#45174)
Ever since the big BoH nerf, BoH bombing is kind of a joke. The damage it does is not really huge, and it's lame for traitors - it lacks emotion and their target may not even die, as they can use the ladders to get away.

So, what this does is add back some soul into BoH bombing, while not making it too round-ending and adding some degree of damage control for admins in case of griefing.
When BoH bombing, a stationary singulo with custom sprite will spawn. Its gravitational pull is REALLY strong, so people near it are probably going to get eaten, and there will be some real damage to the hull. The singulo will cease existing after 5 seconds.

For antags, I think this becomes much more interesting than the current BoH bombing. In the case of griefers, the damage to the station isn't too big because the singulo is stationary and fades away after some seconds. And then, admins can click a button in their chat to bring back everything the singulo ate into the game (the button expires in 10 minutes, however, but this can be changed if you think it is needed).

Settings like gravitational pull can be tweaked if yall find it to be too strong or something.
Changelog

cl
tweak: BoH bombing changed again. Now it's more violent.
/cl
2019-07-25 21:18:01 +12:00
Arkatos1 3350c59105 QoL descriptions update for Malf AI (#45382) 2019-07-24 16:13:51 -07:00
Qustinnus b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00
oranges c1d3d7e0a8 Merge pull request #45366 from Arkatos1/TwistedConstructionFix
Twisted construction fixes
2019-07-24 15:23:30 +12:00
oranges f9fcff10c2 Merge pull request #45376 from Arkatos1/RefundFix
Wizard item refunding fixes
2019-07-24 15:22:18 +12:00
Akrilla 1a5c13bf53 Contract reinforcement antag datum + round end (#45289)
* wip

* antag datum + round end

* custom objective

* bold

* cache check?

* bar

* remove dumb amounts of spacing

* same letter case

* fixup

* no ckey()
2019-07-23 21:33:27 +02:00
bgobandit f2fad8fcca Replaces vitiligo, revitiligo with two new symptoms: disfiguration and polyvitiligo. (#45297)
* Replaces vitiligo, revitiligo with polyvitiligo (adds colorful reagent) and disfiguration symptoms.

* honk

* makes requested changes and changes colorful reagent to crayon powder

* blacklists the crayonpowders that make you invisible or do nothing

* adds message to disfiguration apply
2019-07-23 12:52:25 -04:00
Arkatos1 dcbc7c7b2f Qdeleted exception catch 2019-07-23 02:14:56 +02:00
Akrilla c914d556c1 Give blood brothers traitor HUD (#45295)
* Give blood brothers traitor HUD

* Give teams the ability to have their own huds

* fuck huds

* Team HUDs

* var
2019-07-22 16:48:37 -07:00
nemvar d652f64cd1 bloodchillandtentaclearelesssticky (#45337) 2019-07-22 16:25:24 -07:00
nemvar a16737f925 Swarmers can no longer attack open turfs. (#45330) 2019-07-22 15:47:13 -04:00
Arkatos1 c0f4e1459a Fixes bugs regarding spellbook item refunding 2019-07-22 21:29:24 +02:00
tralezab 3b49b5378d Yet Another Fugitives PR: Bounty Hunters, Features, Fixes, Treason, Removals! (#44802)
* mostly fixes in this commit

* removes old_god from the dme

* russian shuttle improvements

* TODO: fix the hook gun

* shotgun finished, next commit shuttle

* bounty hunting shuttle

* back up to speed on the dmis

* readds poster 46 and adds the shuttle finally

* dmi fixes

* traps need fixing, work out whatever is happening with synths

* super final touches, see desc

map ports + proper spawners, pinpointer and traps functional. other misc changes

* removes verb stuff from non verb stuff

* review (see desc)

antimagic checks and it now the two objects move inside each other instead

* dmi conflicts

* PLUNGERS. BEGONE.
2019-07-22 20:00:34 +02:00
Arkatos1 e01401ecce Twisted construction sanity checks 2019-07-22 15:57:03 +02:00
skoglol c5d6a521e7 Removes the overthrow gamemode (#45312)
* Removes the overthrow gamemode.

* Woops.
2019-07-22 01:10:02 -07:00
nemvar 2fb1150130 Replace global TAB variable with a define (#45264)
Replaces 4 spaces global var with a define!! BADMINS BTFO'd YET AGAIN!!
2019-07-20 16:22:05 -07:00
moo 33657ac0d5 Eternal Youth/Sentient Disease Fix [WEBBIT WARNING] (#45190)
About The Pull Request

Removes both old symptoms, adds a new one with middle-ground pricing.

Also removed random double lines and made it formatted consistently through the file.
Why It's Good For The Game

It's a fix
Changelog

cl
fix: Removed the 2 Eternal Youth Symptoms in Sentient Disease
balance: Added a new EY symptom that has middle-ground pricing of the 2 old ones.
/cl
2019-07-19 22:41:31 +12:00
Rob Bailey bfb6cf01bb Refactors shield wall generators (#45221)
* migrates the shield generator to the powered typepath

* map update

* fixes wire unsecuring weirdness

* this should go here actually

* minor reformatting + documentation
2019-07-19 08:05:57 +02:00
ShizCalev 3e011314b5 Merge pull request #45212 from wesoda25/asdasdasd
Shades Captured With a Purified Soulstone Now Appear Holy
2019-07-18 05:09:59 -04:00
nemvar d2ee3cc05b Xenos no longer delay round end. (#45230)
* Original fix donut steal

* preventroundtypconversion
2019-07-18 10:26:14 +02:00
oranges 5a1ec311e9 Ratvar callback no longer fires if item deleted by damage taken (#45215) 2019-07-16 21:38:01 -07:00
wesoda25 5490d9c498 Update soulstone.dm 2019-07-15 22:45:35 -04:00
skoglol 79f9289eba Sentient disease cures consistently harder, fixes uncurable diseases (#45148)
* Sentient disease cures consistently harder.

* Some comments.

* comment update.
2019-07-15 15:34:45 -04:00
Akrilla 4dda76b8f1 [READY] Contractor Hub (#45117)
* Contract Hub + Pinpointer + more contracts

* Show rep

* Better errors

* Dynamic hub

* Bug fixes

* Show items

* No html in desc

* compile

* contractor support

* limit

* allow limits of 1

web edit

* Equip and send partner + turf helper

* working reinforcements

* Cleanup

* removing debug

* blackout

* test

* Working buttons

* no debug

* prelight

* finalized interface

* better fit

* hub icon

* conflict

* text

* error

* kit tweaks

* items

* fixup

* fixup

* bugfix

* ui fix
2019-07-15 20:36:54 +02:00