Commit Graph

24087 Commits

Author SHA1 Message Date
SteelSlayer
de0853e2a0 ashstorm mmi fix (#17065) 2021-11-12 13:36:57 +01:00
Charlie
41e774ab7f Sling veil now properly updates plasmamans helmet sprites. (#17072)
* fix

* fix prt 2
2021-11-12 06:22:30 +01:00
mochi
f7701c65d6 Fixes hair for IPCs 2021-11-11 22:52:47 +01:00
Fox McCloud
8061afa550 Merge pull request #16172 from dearmochi/hair-gradients
[READY] Port hair gradient customization
2021-11-11 15:40:21 -05:00
Fox McCloud
06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
variableundefined
6ece7187a0 Merge pull request #17068 from farie82/fuel-tank-bullet-fix
Shooting fuel tanks now is logged properly and objects that get qdeleted by bullets now only get hit once
2021-11-11 14:09:04 -06:00
joep van der velden
39a280effd Shooting fuel tanks now is logged properly
objects that get qdeleted are only hit once by bullets
2021-11-10 10:23:47 +01:00
Fox McCloud
e2c10ec83d Merge pull request #16775 from Qwertytoforty/RIP-AND-TEAR-but-not-nightmare-mode
Nerfs (S)laughter demons
2021-11-08 14:40:57 -05:00
Fox McCloud
308814c0d9 Merge pull request #17025 from matttheficus/DownWithSpeed
Removes Leg Muscle Stimulus from DNA Vault
2021-11-07 23:59:18 -05:00
Qwertytoforty
1e66469676 Adds an event that uses the base slaughter demon, rather than midround 2021-11-07 12:37:10 -05:00
variableundefined
9f2f9ac45e Merge pull request #17038 from E-MonaRhg/carpet-stuff-two
The Subsequent Carpet PR: tweaks and tables edition
2021-11-07 10:24:47 -06:00
Charlie
126ab04480 Fixes krav's animations (#17052)
* disarm animation

* combos
2021-11-07 09:05:02 +01:00
S34N
44c12c6d9d Fixes open crate sprites (#17050)
* fakin underscores

* more crates

* sneak this one in too
2021-11-06 21:42:47 +01:00
variableundefined
1739f411a2 Merge pull request #16823 from S34NW/3/4th-closet
3/4ths Sprite Project: Closets
2021-11-06 14:19:14 -05:00
S34N
e76eb297d5 Reactive armour now logs any damage done (#17030)
* fire from reactive incendiary now logs

* other armours too
2021-11-06 11:22:28 -06:00
SweetBlueSylveon
2fdcbf8551 Grey Plushie Get! (#16991)
* Adds a Grey Plushie

Adds a grey plushie to the game, putting it as a loadout option, and adding a new sprite.

* Adds water interaction

Adds a water_act to the plushie. The plushie will now changed to "grey_singed" when touching water.
Upon touching water the plushie will scream and go "AAAAAH!" which then puts all text and audio interactions onto a 300 cooldown.
The plushie can also be hugged to make it go "Ow..." if its icon is set to singed. This is on the same cooldown as vox screams.

* Minor fixes

Fixes minor syntax and redundancy problem in the code.

* Updated sprite

Adds new sprites for grey_plushie and grey_singed.

* Converts Cooldown and spawn system to timer.

Changes the cooldown and spawn system to a timer and callback system.

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

Adds early return.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

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

Simplifies code, corrects mistakes.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Complicated

-Splits the cooldown variable and proc into two, one for hugging one for screaming.
-Adds more BOOLEAN
-Properly implements Timer and Callback system.
-Adds early returns.

* Revert "Complicated"

reverts dme changes.

* Adds an if statement

Adds an if statement so that the server is not setting the icon and description every time the plushie gets wet.

* Minor correction

Fixes the order of the if statement and changes its type.

* Reverts test change

Last commit had testing changes I failed to revert before pushing.

* Changes the sprite.

-New, smaller icons.
-Slightly heavier shading.
(Can be undone and edited further, I still have the other sprites)

* Another sprite update

-I learned to use HSL.

* Small bugfix

Last code update I wrapped the screaming proc into the "don't set the icon and description if it's already singed" by accident. Swapping them around fixed it, and it will now be able to yell from water every 30 seconds again.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-11-06 17:34:17 +01:00
Charlie
7afeb9a4f9 fix (#17043) 2021-11-06 15:08:37 +01:00
E-MonaRhg
ac68ea59df Carpet and table stuff 2021-11-05 19:46:42 +02:00
variableundefined
f11ad29e8d Merge pull request #16824 from PacifistDalek/burger-tg-sprites
TG Sprite Porting: BURGERS Edition
2021-11-05 08:39:53 -05:00
variableundefined
97a88da9a9 Merge pull request #16895 from lewcc/vomit-comet
Nutriment Pump Implants make you projectile vomit when EMPed
2021-11-05 08:38:30 -05:00
AffectedArc07
db3a3c8bc2 Adds Paradise API support (#16981) 2021-11-05 14:04:49 +01:00
Luc
9f67e43493 Prevents usage of martial arts with the passive trait (#16988)
* Prevent passive mobs from using martial arts

* Update laser reflection, clean up combo message

* Silence annoying message

All martial arts just check if the user is a pacifist or not before executing
2021-11-05 10:23:26 +01:00
Farie82
3bbe06f3fe Makes it possible to announce the ERT denial to the crew (#16842)
* Makes it possible to announce the ERT denial to the crew

* can deny ERT now when sender is KO or has no headset
refactored the stuff around it

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Sabre's review
Message format for the input
Early return

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-11-05 10:18:53 +01:00
datlo
d94210031b Refactor C4, subtypes, and airlock ex_act (#16995)
* Refactor C4 and Airlock ex_act

* update uplink desc

* Replace ismob by carbon, clarify comment

* remove unnecessary ismob check

* replace destroy by qdel, fix comment

* auto doc comments, add else condition

* Add comment to shaped c4

* Shortens shaped boom proc, make airlocks more resistant against light ex
2021-11-05 10:12:09 +01:00
hal9000PR
3b7e9fee93 refactors butchering of humans with chainsaw/meatcleaver (#16812)
* traits

* examine

* I am incapable of writing

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* people

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-11-05 09:11:10 +01:00
SabreML
1c3c2c22ad Name Capitalisation Tweaks (Weapons) (#16906)
* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
2021-11-04 19:47:31 +01:00
Paulo Elienay II
7abc485a78 Unable to remove solar panel assembly from a bag of holding #17021 (#17023)
* fix: #17021

* style: project style

* refactor: project style

* refactor: requested changes

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-11-04 19:00:21 +01:00
variableundefined
4456caf3cb Merge pull request #17028 from paulo-e/fix/17016
Ash Walker wasn't an offstation role #17016
2021-11-03 20:07:07 -05:00
Elienay Albuquerque
1660df05ff fix: requested changes 2021-11-03 16:55:04 -03:00
Elienay Albuquerque
fa503a9fc8 fix: #17016 2021-11-03 10:56:20 -03:00
variableundefined
c6465fc014 Merge pull request #16942 from PacifistDalek/hydroponics-sprites-2
Whole bunch of Hydroponics Sprite changes (redux)
2021-11-02 23:32:48 -05:00
variableundefined
1b04314884 Merge pull request #16783 from Sirryan2002/WinterRuin
Reworks the Snow Biodome Ruin
2021-11-02 23:24:35 -05:00
variableundefined
3c663c12cf Merge pull request #16561 from hal9000PR/AHA-guidelines-on-outcome-oriented-resuscitation
Compression only CPR
2021-11-02 23:18:04 -05:00
matttheficus
ee55e06309 enforcing a speed limit 2021-11-02 17:01:12 -04:00
variableundefined
568d27a5ee Merge pull request #16994 from lewcc/oof-ow-my-organs
Improve organ damage feedback
2021-11-02 08:54:53 -05:00
Fox McCloud
74f8aeb61d Merge pull request #16951 from SabreML/swarmer-initialisation
Fixes swarmers initialising multiple times
2021-11-01 18:21:53 -04:00
Fox McCloud
b9d322bbbe Merge pull request #17005 from paulo-e/fix/17003
Can't dispose abstract items #17003
2021-11-01 18:01:37 -04:00
Fox McCloud
13a749c452 Merge pull request #16976 from SabreML/ipc-damage-overlays
Fixes IPC damage overlays not updating
2021-11-01 18:00:52 -04:00
S34NW
1723e0b503 Merge branch 'master' into 3/4th-closet 2021-11-01 10:14:41 +00:00
variableundefined
d2d4ec19b4 Merge pull request #16989 from rythenx/add-fax-log
add a notification when replying to fax
2021-10-31 22:33:50 -05:00
variableundefined
9996b7bfa3 Merge pull request #16990 from Vi3trice/aperture-shower-curtain
Adds feedback to the Telegun's target setting, and applies it to the current shot
2021-10-31 22:33:24 -05:00
variableundefined
416f330481 Merge pull request #16999 from lewcc/xeno-orbit-menu
Add xenomorph section to orbit menu
2021-10-31 22:26:11 -05:00
variableundefined
c0e21aa64e Merge pull request #16996 from hal9000PR/bnuuy
Adds Bunnies.
2021-10-31 22:24:31 -05:00
Elienay Albuquerque
e54d406ffb refactor: more requested changes 2021-10-29 16:18:49 -03:00
Paulo Elienay
c767d4b6e6 fix: reverts last commit and adds comment 2021-10-29 06:04:35 -03:00
Elienay Albuquerque
e3be4db007 refactor: requested changes 2021-10-28 17:57:42 -03:00
Elienay Albuquerque
e0eb271a31 fix(disposal): DRODEL items now ignored 2021-10-28 16:16:34 -03:00
Paulo Elienay
8b36807988 fix(17003): can't dispose abstract items
Abstract items (such as slapper) should't be allow to be disposed away.
2021-10-28 12:47:40 -03:00
lewcc
8d5409d4ff Add xenomorph section to orbit menu 2021-10-27 12:36:15 -04:00
mochi
c7046c0756 Merge branch 'master' into hair-gradients 2021-10-27 13:33:12 +02:00