Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Removes borgs#12362

Merged
JamieD1 merged 97 commits intomemesfrom
revert-12361-TheGamerdk-patch-4
Sep 23, 2021
Merged

Removes borgs#12362
JamieD1 merged 97 commits intomemesfrom
revert-12361-TheGamerdk-patch-4

Conversation

@Bibby0110
Copy link
Contributor

@Bibby0110 Bibby0110 commented Sep 23, 2021

No description provided.

adamsong and others added 30 commits September 11, 2021 02:25
* piss

* second set of files

* theos feels pain and dies

* code works lmao

* other stuff

* YES YES YES

* Update zombies.dm

* egg

* whoops

* bubblegum alt attacks won't wound

* bone hurting juice hurts bones

* something's fucky wucky

* humans are no longer blue space babes but projectile damage is still wack

* IT WORKS???????

* other stuff

* turns out im big brain and already handled that should be testable live now

* WHOOPS

* medical pens not in stupid area

* fix regen mesh icons

* tool_behavior and defines plus allowing wound healing to override surgical tool no touchy bit

* should help

* mapping problem

* fix monkies shitting out blood all the time

* going to remove examine_more being stupid

* this is stupid i think it works though

* Empty commit, more bad code

* this probably fdixes something

* buckshot buffed back to where it should be

* woundings

* missed this one

* fix gamebreaking bug

* turns out damaging ANYTHING causes suit sensors to break whoops

* stuff up to limb disable refactor

* aid scanner can no longer kill you if you use it too much, preventing the robot uprising for another few decades

* Update burn_dressing.dm

* wtf

* shotgun slugs have a wound bonus of -30 putting them in line with other high damage weaponry that has even less

* burn debriding uses the scalpel rather than the hemostat

* debriding for patch/treat no longer causes wounds

* Give syndicate medical cyborg a bonesetter

* like 5 more prs ported

* fixes burn ointment and mesh application not having a progress bar

* gamemode zombies get easydismember and easily wounded

* managed to screw up self cautery this fixes it

* carbons can't use check self for injuries but humans can

* honey gives +2 sanitization to burns

* re-add this if sensors get fixed

* should fix a runtime I made on accident when trying to make examine more less jank

* last 2 prs and some holdup fixes since these touched on that

* set target = src so the progress par shows up i think

* Update mutations.dm

* fixes twohanded reuqired weapons by reverting some change I don't understand

* fixes blood sprites

* actually properly fixes the thing

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: Idinuum <37936685+Idinuum@users.noreply.github.com>
…nse (#12271)

* Update cigs_lighters.dm

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

Co-authored-by: Byemoh <baiomurang@gmail.com>

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

Co-authored-by: Byemoh <baiomurang@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: Idinuum <37936685+Idinuum@users.noreply.github.com>
So, turns out I didn't upload the icons for the vial fillings.
* The "La-Li-Lu-Le-Lo"! How's that possible!

* i change my mind on these ones

Co-authored-by: Idinuum <37936685+Idinuum@users.noreply.github.com>
@Bibby0110 Bibby0110 added Javascript This PR contains javascript code. Literally the best PR My god its beautiful Map - Approved This PR's mapping side has been approved by a mapping maintainer Mapping Issue This issue is caused by a mapping error, or it is a mapping request. Maps - Missing You need to implement the change on every station Merge conflict Files are conflicting with current live changes. Missing/Inadequate Rationale This pr is missing a 'why is this good for the game' section or it is inadequate Needs review This PR needs to be reviewed Old Yogs Port Oh yeah we didnt port everything yet On hold - HD Should not be merged without HD Approval Performance This has some affect on server performance. SPEEEEEED python Pull requests that update Python code Refactor Makes old code less shit Revert / Deletion Altoids is probably mad about this Security Issue Poses a significant threat to clients or the server itself Sound This PR changes audio files Sprites This PR has spriting changes SQL This PR has SQL code within, likely database related Stale I'm closing this in like a week if you don't push a new commit Test Merge - Requested This PR is waiting for a test merge to be scheduled Test Merge - Scheduled This PR is waiting to be test merged TESTMERGED This PR is currently live in a test merge. tgui This PR affects TGUI Tweak This PR contains changes to the game. labels Sep 23, 2021
Copy link
Contributor

@adamsong adamsong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Atomize these changes

@KillerOrcaCora
Copy link
Contributor

A fight between gods is what we are seeing here folks.

Copy link
Contributor

@nmajask nmajask left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reintroduces a bug fixed in the original PR

@Bibby0110
Copy link
Contributor Author

This reintroduces a bug fixed in the original PR

hmm

@N3D6
Copy link
Contributor

N3D6 commented Sep 23, 2021

this is my favorite pr

@JamieD1
Copy link
Contributor

JamieD1 commented Sep 23, 2021

Bibby has been removed from Maintainer for a week.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Controversial People are divided on this PR Invalid This is not a real issue. Likely an intended feature. Missing/Inadequate Rationale This pr is missing a 'why is this good for the game' section or it is inadequate Revert / Deletion Altoids is probably mad about this

Projects

None yet

Development

Successfully merging this pull request may close these issues.