Commit Graph

3355 Commits

Author SHA1 Message Date
nemvar
6d7bccfca4 Jackhammer nerfs. This thing no longer destroys wall instantly. (#46019) 2019-08-23 16:45:31 -07:00
moo
74ed605cd7 Cobbduceus Part 1/X: Category Twos, Base(d) Healers (#45749)
* 150 hours

* it compiles guys

* PERF

* meta conflictor

* oldcabin

* Revert "meta conflictor"

This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.

* oldmeta

* TAKE 5000

* NAME THIS

Also redoes Multiver/Palletta

* FRICK U FIZ

* NERF PERF

* comment cringe

* Checks for restraints/incapacitated for ichiyuri

* URIKA

Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.

* organ

* please upvote this

* maps...

* Gives Instabitaluri a Brand Name

Oh wow it's synthflesh 😆

* Update cat2_medicine_reagents.dm

* what kinda characters is Krys using
2019-08-22 17:30:16 -07:00
oranges
57266c7d35 Merge pull request #45701 from Dennok/ChangeTurf-calls-add-keep-air
Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls.
2019-08-21 11:23:11 +12:00
tralezab
8b190dbc27 fixes golems not getting antag and other things when switching shells (#45941)
fixes golems not getting antag and other things when switching shells
2019-08-17 23:41:33 -07:00
nemvar
a40ee7d303 Changes hulk code. (#45866) 2019-08-17 00:55:27 -07:00
tralezab
4fa0d761a8 song for this fix: Enigma - Modern Crusaders (#45936) 2019-08-16 21:12:21 +02:00
Rob Bailey
b25d3efda2 correct black suit (#45876)
* correct black suit

* two piece in wardrobe
2019-08-13 17:17:55 -07:00
bgobandit
ee0d68aeca Clicking a display case on help intent examines it. (#45842) 2019-08-13 16:48:03 -04:00
Rob Bailey
4b17e5297f Reinforced window construction fixes (#45890)
About The Pull Request

Fixes a couple of issues related to window construction introduced by the tougher windows PR.
Also gives plastitanium and shuttle windows matching values to reinforced and plasmawindows like I intended to on the last PR.
Why It's Good For The Game

fix
Changelog

cl
fix: newly constructed reinforced windows start in the correct state, meaning they can be disassembled
fix: crowbar can no longer be used out of order on construction
fix: screwed down but not levered in windows can be unscrewed again
tweak: shuttle and plastitanium windows now have the proper values to match reinforced windows.
/cl
2019-08-13 17:19:26 +12: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
James
be3000d8ca All windows now have consistant spans (#45809)
* R-Windows now have consistant examine messages

* I forgot plasma windows too
2019-08-10 02:25:07 -07:00
Twaticus
9dfa78cb47 Underwear color (#45630)
About The Pull Request

    Changes our current underwear selection to greyscale so you can color them any way you like, just like hair.

    Removed duplicate underwear types that only served as a few color options(female_yellow, male_blue, ect.) Underwear with designs are unaffected(female_uk, male_commie, ect.)

    Added a new option in dressers to change underwear color.

    Changed some underwear names to fit the new option(female_red is now female_lace, ect.)

A9hAqkxgin
If all is well i plan on adding this to undershirts and socks too.

also HUGE thank you to nonfictiongames for the help!!!!
Why It's Good For The Game

More character customization in roleplaying game GOOD
Changelog

cl
add: Underwear can now have any color. (Your character will most likely be nude now so check your prefs!!)
add: Underwear color option in dressers
tweak: changed some underwear names
imagedel: deleted duplicate underwear

/cl
2019-08-09 11:04:58 +12:00
Rob Bailey
a5de1c1b5e [READY] Reinforced windows are harder to get through (#45609)
About The Pull Request

full tile Reinforced windows now require a melee item over 11 damage to damage, have 150 health, and 90 melee armor. This is approximately 2 minutes of sustained beating with a toolbox.
full tile reinforced Plasmaglass windows now require a melee item over 21 damage to damage, have 200 health, and 95 melee resistance. This is approximately 3 minutes of sustained beating with a toolbox.
dir windows have been given the appropriate halved health values.

Current deconstruction steps:

    heat one way screws (welder, 18 seconds, harm intent required)
    unscrew one way screws (screwdriver, 8 seconds)
    pop out panel (crowbar, 5 seconds)
    cut connecting bars (wirecutter, 3 seconds)
    unbolt frame (wrench, 5 seconds)
    theoretical fastest time: 39 seconds
    more practical time: 45 seconds

if the bolts are heated and then not unscrewed within 30 seconds they cool off again, and must be heated again

Construction is the same as before except the crowbar levering step takes 10 seconds instead of 3.
Why It's Good For The Game

Getting into places you shouldn't be is currently way too easy.
This change forces you to hack in, disassemble the window, or target a weak point like a windoor.
At the moment, it is possible to smash down what is intended to be a secure window with an item you get in your bag at roundstart for free. This is stupid. It should require some planning or at least thinking to be able to make your way in places you should not be.

Oranges has talked in the past about departments being designed like impenetrable fortresses with shutters everywhere, and this happens because reinforced windows are far too weak and unreliable to be able to have as effective defense of any department against even underequipped and underprepared people. This leads to the introduction of shutters which are too strong and difficult to deal with in most cases.

This is part of some plans to make departments more secure overall while still providing ample avenues for determined or properly prepared individuals able to get in if they want to. Despite having more plans along with this, this is a standalone change as is. This is not a "this will only work with later changes I'm totally going to do" situation
Changelog

cl
balance: Reinforced windows now require a melee item over 11 damage to damage, have 150 health, and 90 melee armor. This is approximately 2 minutes of sustained beating with a toolbox.
balance: Plasmaglass windows now require a melee item over 21 damage to damage, have 200 health, and 90 melee resistance. This is approximately 3 minutes of sustained beating with a toolbox.
/cl
2019-08-09 11:03:59 +12:00
81Denton
7b8579c17a Minor ghost notify changes (#45759) 2019-08-08 01:47:04 -07:00
Arkatos1
c638de2370 Init fixes (#45762) 2019-08-08 01:07:33 -07:00
nemvar
0d5f3b1fc4 Leave me alone (#45743) 2019-08-07 14:55:30 -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
MMMiracles
cf5fa29c14 various fluff mapping items (#45699)
* ignore me thanks

* ass

* loads of misc fluff shit

* irrelevant shit

* chain file
2019-08-05 19:17:13 -07:00
nemvar
4d5fb1a578 Adds a GPS component. (#45660)
* Adds a GPS component. Megafauna no longer needs gps implants.

* Removes commented out code.

* Removes the last internal radio

* I was already wondering why the diff was so small
2019-08-05 19:13:19 -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
nemvar
0cb92c724a Fixes that one issue (#45717)
You can no longer pick up sofas
2019-08-05 11:50:22 -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
Dennok
d464a7c689 add flag CHANGETURF_INHERIT_AIR 2019-08-04 12:54:12 +03: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
Tlaltecuhtli
5d2bd62beb fixes traps (#45650)
* Update maps.txt

* Update traps.dm

* Update maps.txt
2019-08-03 11:15:13 +02:00
Rob Bailey
e8030fecf6 Merge pull request #45581 from Twaticus/inhand-bedsheet
Inhand sprites for bedsheets
2019-07-31 03:00:49 -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
TWATICUS
1f0dc52435 Merge remote-tracking branch 'Upstream/master' into inhand-bedsheet 2019-07-29 06:11:36 -04:00
TWATICUS
7025d515b7 h
h
2019-07-29 06:11:07 -04:00
spookydonut
88eca69eb5 converts some spawns into timers (#45429)
* converts spawns into timers

* linter

* change per review
2019-07-29 02:23:15 -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
Dennok
213b86ca22 Shuttle-buttons (#45444)
connect_to_shuttle add shuttle id to connected machine id
Buttons from one shuttle dont controls machinery from another by default
2019-07-27 20:19:56 -07:00
bgobandit
a53d7d38d4 what has become of my life 2019-07-27 21:54:12 -04:00
Dennok
6d9d92b7ac Tabbles and racks can be disassembled only on non help. (#45433)
* Tabbles disassembled on harm

* Change harm to non help intent
2019-07-26 02:21:29 -07: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
Qustinnus
ef7a99dfa6 Tendrils properly drop loot when hit by extreme explosions. (#45339)
cl floyd
fix: Tendrils properly drop loot when hit by extreme explosions.
/cl

also fixes that explosions apply damage weirdly

Fixes #44979
2019-07-25 16:24:27 +12:00
nemvar
709e2f55b0 Fix a bug where the monkfrock didn't frocking spawn (#45408) 2019-07-24 18:03:31 -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
Rob Bailey
79ae4aaa5a fixes grilles not updating cables (#45318)
About The Pull Request

Fixes cables not updating nodes when grilles are destroyed
Changelog

cl
fix: Cable nodes now visually update after grilles are built and destroyed
/cl
2019-07-24 15:39:31 +12: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
nemvar
876db778a7 Durathread and loom changes. (#45261)
* Reworked loom and cloth

* newline

* Removes unneeded .=

We were returning TRUE regardless.
2019-07-21 17:40:00 -07:00
MadoFrog
13d34034c3 Adds an award for the HoP to give (#45290) 2019-07-21 16:10:41 -07:00
YakumoChen
b2502f10cf Fixes diagonal box movement, makes stealth box reveal when damaged (#45274)
About The Pull Request

Lowers the integrity of the implant box from 70 (normal cardboard boxes) to 1
fixes #38612
Why It's Good For The Game

The stealth box is already an extremely powerful item, mostly due to a bug #38612 that has been around ever since we could move diagonally and hasn't been fixed.

The box is supposed to be comparable to the other stealthy item, the Chameleon Projector. However, the box has several large advantages, including:
-Full invisibility
-Faster movement (especially with the bug)
-Less obvious when moving around
-The box takes more hits to reveal you
-Easier to get back to being hard to find when revealed
-You need an open hand to open the box manually, putting you in melee range and without a weapon in the selected hand, leaving you at a major disadvantage.
-The projector can be taken away from you / dropped and takes up inventory space
-The projector needs to be in hand to use, implant is hands free
-Projector needs to be in your in-use hand to disable yourself, the box is a button, meaning you can be more prepared with the box to strike out from stealth.

The projector still has a niche, however the box is currently the meta stealth item to pick.

This PR fixes the movement bug (no more wavedashing) and makes any damage to the box reveal the user, no longer letting it be a massive damage sponge. This should bring the box much closer in line to where the Chameleon Projector is, balance wise.
Changelog

cl Chen Yakumo
balance: The stealth implant box is now flimsier than it was before.
fix: You can no longer zoom around in a box by hugging walls.
/cl
2019-07-21 11:05:43 +12:00
MMMiracles
353457f7d5 Donutstation Tweaks (#45250)
About The Pull Request

    Fixes #45077
    Fixes #42498
    Removes every single instance where a grille could end up on top an active wire in maintenance, making traveling maintenance a lot less of a hassle and less dangerous in general.
    Maintenance bar has been removed due to redundancy and closeness to the actual bar. Wait till season 10 of SS13: Battle Royale to find out what exciting changes will come to the map!
    Space-proof variants of the lizard critter has been added and are working diligently on the above-mentioned bullet-point.
    As part of the white shuttle fix, Donutstation now has a custom shuttle with deep l o r e to explain what happened to the long-past crew.
    Small adjustments to the static loot part of the 'excess storage' rooms near departments.
    Some extra crates has been added around maintenance with respective maintenance loot spawners.

Why It's Good For The Game

Bug fixes relating to the map and some added map content to keep things 'fresh'.
Changelog

cl MMMiracles
add: Donutstation now has its own white shuttle with proper dock.
del: Donutstation's maintenance bar is under renovation.
tweak: Due to above renovations, the goose is temporarily loose.
tweak: Donutstation now has significantly less annoying maintenance grilles
/cl
2019-07-19 23:11:57 +12:00
Twaticus
2b4c123fc0 Skirt Update (#45244)
About The Pull Request

Some skirt sprites were offset i dont know how this happened i swear i fixed this before but apparently not. Fixed the assistant skirt necklines being way too high. Added extra details on some skirts.
Added 5 previously missing skirts including 2 lawyers skirts(like they dont have enough already), rainbow, syndicate and tacticool. Fixed the disorganized mess that was the Lawdrobe.
Why It's Good For The Game

Updated skirts good. Rainbow skirt good. Skirtleneck good.
Changelog

cl
add: The long lost rainbow jumpskirt has been found
add: Rumor has it that even the syndicate have started producing skirts for their operatives
tweak: Department skirt necklines are more in-line with their jumpsuit counterparts, sprites are no longer offset, added detail
/cl
2019-07-19 22:39:41 +12:00
Mickyan
e26abb7047 Random pixel shift for dropped/thrown objects (#45155)
* pixels

* offset for any throw, critical bedsheet bugfix

* nyeh

* might as well (autodoc)

* renamed proc

* removed redundant src

* moved call from dropped() to dropItemToGround()

* handles storage dumping, customizable max offset

* adjusted values

* inline
2019-07-16 00:51:17 -07:00
skoglol
9560fd8293 Fixes potted plant damage. 2019-07-13 22:23:21 +02:00
ShizCalev
84bec66f17 Merge pull request #45130 from Fikou/patch-5
budget cards now go in the department head lockers
2019-07-12 23:54:21 -04:00
nemvar
572be7ec6a Bye bye animal hospital. (#45070)
* byebyeanimalsurgeons

* here we go

* config

* removesbeach

* a bit more compact

* updates some vars

* fixes walls getting destroyed by other generation stuff
2019-07-12 09:47:05 -04:00