Commit Graph

11132 Commits

Author SHA1 Message Date
nemvar
a8819d4b25 Fix armor penetration cancelling negative armor (#44928)
Armor penetration no longer decreases damage when used on a mob with
negative armor.
2019-07-04 10:52:46 -07:00
nemvar
153130e457 Cooler hivebots (#44662)
* Cooler hivebots

* adds some cool light

* moblight

* I...

* no more snowflake intent

* qdel

* QDEL_NULL
2019-07-04 14:35:30 +02:00
nemvar
53d4c3f25a Refactor mob can_see_reagents (#44934)
Turns the scan_reagents var into a clothing flag.
2019-07-04 00:09:01 -07:00
nemvar
f81ec3907b Remove unneeded get_organ_target proc (#44931)
Removes the get_organ_target proc because I'm to lazy to fully
refactor laser eyes. It is embarrassing that we have a proc like this
in the code. Also makes mob code less cursed, one proc at the time.
2019-07-03 21:39:34 -07:00
nemvar
2539dbeb0e Fix checking armor of the wrong bodypart sometimes (#44930)
Fixes a bug with human where sometimes the armor from the wrong
bodypart gets used when they get attacked.

Bugs bad. Also, armor code is highly cursed.
2019-07-03 18:06:42 -07:00
oranges
64460ae3ca Merge pull request #44825 from AutomaticFrenzy/patch/lints
In advance of eventually adding SpacemanDMM's linter to Travis, fix everything it can currently detect.

Some lists, including global lists, are given types so that L[i].foo expressions can be checked.

Some procs are given a new form of return type annotation so that DuplicateObject(O).forceMove()-type invocations can be checked.

Open to syntax suggestions on the return type annotations, and on whether the preprocessor strategy makes sense.

Return type syntax is currently roughly:

    <typepath> | <paramname>([_])*(.type)?
2019-07-03 19:31:11 +12:00
ShizCalev
6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
plapatin
c863766ea4 THE VOMITGOOSE PR (#44563)
* vomi/tg/oose

* fuck

* cleaning up icons

* action button time

* seperating if checks

* makes goose hungry

* untested

* last change

* new additions

* qucikfix

* fug

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

* fugg

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

* fix the fucky wuckies

* ninja spent a full hour of their life spoonfeednig me on how to make an untyped proc

* FUCKING INDENTS

* whoever made that comment in turf.dm is a buffoon

* does more things

* adds return things

* appease ninja

* makes maintainers happy

* last fix maybe

* adds more fun

* makes more maintainers happy

* balance

* it can now be loose

* goose_satiated

* fuck

* ok maybe 170 is too much for a max

* Update code/modules/mob/living/simple_animal/hostile/goose.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/goose.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/goose.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/goose.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/goose.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* woops

* Revert "Update code/modules/mob/living/simple_animal/hostile/goose.dm"

This reverts commit 9f45c26721550d5991240b82dcddf01be81ccd3b.

* Revert "Update code/modules/mob/living/simple_animal/hostile/goose.dm"

This reverts commit 0fe63392f608114a4f82e59644dd4b46599032ff.

* Revert "Update code/modules/mob/living/simple_animal/hostile/goose.dm"

This reverts commit 4117e196b8093ad0a966d54dff43887d623c8f74.

* Revert "Update code/modules/mob/living/simple_animal/hostile/goose.dm"

This reverts commit 8bfbb977cba7bb1eda83532bc8a3865373e4f019.

* Update code/modules/mob/living/simple_animal/hostile/goose.dm

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

* Update code/modules/mob/living/simple_animal/hostile/goose.dm

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

* Update goose.dm

* i hope this doesnt cause more merge conflicts

* Revert "i hope this doesnt cause more merge conflicts"

This reverts commit 842e1a8a851c45c1d94fb0720d0995a5dd2c7083.

* test

* ok maybe this time

* please god work this time

* please god work this time

* FATHER INTO YOUR HANDS I COMMEND MY SPIRIT

* shortening typecheck

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

* does

* WHY HAVE YOU FORSAKEN ME

* IN YOUR EYES FORSAKEN ME

* IN YOUR THOUGHTS FORSAKEN ME

* as it turns out getting the turf twice wasnt necessary
2019-06-29 11:54:34 -04:00
JJRcop
938789d0a7 [READY] Blocked words tell you which ones (#44728)
About The Pull Request

Same premise as #44712 but using a simple regex replace and also on the client side
Closes #44712

I was gonna PR it to #44712 but half way through I realized I had already replaced nearly all of bobbah's changes, and after I was finished the branches shared nothing.
Why It's Good For The Game

The delta is way smaller and simpler
Should solve the DoS concerns without needing a limit on bad chats because it's not a loop it's on the client side
Changelog

cl JJRcop and Bobbahbrown
tweak: When attempting to say a blocked word in character you will be notified which ones were blocked.
/cl
2019-06-29 21:09:56 +12: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
Brett Williams
e09d26acba Add log message when player dies (#44855)
Logs a message upon player with with name, location, and damage. I
elected to put this in game over attack as it feels more relevant to
game.
2019-06-29 00:22:44 -07:00
4dplanner
146be2c828 Do not resuscitate is permanent (#44850)
* Do not resuscitate is permanent

* Hope -> Save Me
2019-06-29 01:40:45 +02:00
AnturK
89438fae72 Fix a few reagent runtimes (#44824) 2019-06-27 21:42:50 -07:00
nemvar
c3decc43e1 Really small refactor to ear and eye protection (#44832)
I really hated to look at this code every time I opened carbon defense.
2019-06-27 21:06:34 -07:00
oranges
6058dd39e9 Merge pull request #44820 from bgobandit/fetishcontent
Collars can now be worn again
2019-06-28 11:46:15 +12:00
kingofkosmos
c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
oranges
144c20762a Merge pull request #44792 from Shapsy/positive-brain
Adds support to MMI's and Posibrains for Show Policy
2019-06-27 20:29:03 +12:00
kingofkosmos
ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03:00
kingofkosmos
d7dd679b5a Fix span endings (#44812)
Adds a slash to instances of <span>" --> </span>".
2019-06-26 15:11:03 -07:00
flufflycthu1u
00af273886 Fix runtime when clown hulks try to open doors (#44801)
Clown hulks from the admin only simple mobs cause an error when trying
to open access restricted doors, this fixes that.
2019-06-26 02:15:40 -07:00
Tad Hardesty
ba95173289 Fix keyword argument warnings 2019-06-26 01:59:57 -07:00
Tad Hardesty
0f0604575f Add return type annotations to some procs 2019-06-25 23:03:38 -07:00
kingofkosmos
ebf787a97a * "You should..." and "You must..." 2019-06-26 06:13:32 +03:00
bgobandit
d77fffb1bb Collars work on pets again. 2019-06-25 20:54:06 -04:00
kingofkosmos
81a0518474 * warning-spans added to cases of "You do not..." and "You don't..." 2019-06-25 22:05:55 +03:00
kingofkosmos
6bbb64e2cf * more warnings 2019-06-25 21:46:21 +03:00
kingofkosmos
fb9731492c * extra spaces removed from "span class = '" --> "span class='"
* warning-spans added to cases of "You need..."
2019-06-25 21:03:25 +03:00
Arkatos1
6c867b6936 Carp Expansion Pack [greyscaled] (#44720)
About The Pull Request

This PR ports Baystation color carps. In short, normal carps can now spawn in variety of colors, 

This only affects normal carps, not special ones like magicarps or megacarps, these retain their own unique sprite. There are also some pretty rare color variant for carps and our friendly Syndicate carp Cayenne has increased chance to get it.
Why It's Good For The Game

Better aesthetics and immersion.
Changelog
cl
imageadd: Normal carps now spawn with a random color! There might even be some really rare color variant.. try asking Cayenne about it.
/cl
2019-06-25 11:28:05 +12:00
kingofkosmos
df1aa091b2 * adds warning-spans to various messages 2019-06-24 21:05:22 +03:00
Shapsy
87ce5869fc 🧠 2019-06-24 11:57:24 -04:00
Tetr4
e4b328f7e2 Gives service borgs pipe cleaners for wire art (#44737)
About The Pull Request

Gives service borgs a pipe cleaner module for wire art. However, as they don't have wirecutters, they won't be able to remove pipe cleaners they place.
Why It's Good For The Game

Another thing to do as service borg.
Changelog

clTetr4
add: Service borgs get pipe cleaners for wire art
add: you can altclick to pull up pipe cleaners
/cl
2019-06-24 23:56:14 +12:00
skoglol
dd4f07e52a Fix slimes not feeding (#44760)
The return caused slimes to leave the processing loop without
resetting the AIproc tracking var. This caused the slimes to get stuck
outside the processing loop if they were ever unable to feed on their
target for whatever reason.
2019-06-23 23:33:25 -07:00
oranges
6b31268b30 Merge pull request #44677 from actioninja/revert-44256-legacymovespeedkill
Revert "[READY] Migrates some legacy movespeed stuff to modifier movespeed"
2019-06-24 10:40:34 +12:00
Emmett Gaines
d615abf23c Replaces callbacks in signals with simple proc paths (#44579) 2019-06-22 18:21:57 +02:00
skoglol
8fdbc635c4 Fixes a slime runtime (#44689)
* Fixes a slime runtime.

* Fixes the cause, not the symptom.
2019-06-22 02:18:50 -04:00
AnturK
48f7ae3092 Fixes medbot dropping beakers (#44699)
* Fixes medbot dropping beakers

* yep
2019-06-22 01:47:02 -04:00
AnturK
57170e0970 Fixes ranged syndicate mobs stormtrooper training. (#44700) 2019-06-22 01:46:07 -04: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
d67f0b3e71 Honk staff now lube slips. (#44575)
About The Pull Request

The honk staff no longer stuns. It now slips people on hit.
Why It's Good For The Game

It's one of the best lavaland items and there is absolutely no challenge in getting it. And it has the same unfun components as tasers.
Changelog

cl
balance: The staff of the honkmother now slips people. Honk.
/cl
2019-06-22 10:43:30 +12:00
Qustinnus
9d9a965bd1 New scientist traitor item: Australian Slime Mutator / Spider Injector (#44559)
cl Floyd / Qustinnus
add: New scientist traitor item: Australian Slime Mutator / Spider Injector, use it on a gold slime extract to create 3 neutral broodmother spiders, make them sentient and start your own hive.
/cl

'ello mates, Me and my syndicate expedition team have recently returned from my journey to the Australicus sector and crikey the spiders are big there. Fucking the size of a bear. Luckily one of my fellow expeditioners managed to knock one of the fuckers out with a boomerang and we took 'er to our labs. We managed to extract some of their extract which is known to create tame offspring when injected into a gold slime core.

However, if you give it sentience and tell it to do whatever you want, maybe you can use it for a useful purpose?

10 TC item, lets you inject a gold-slime core for some midwife/broodmother spiders that can help you start a spider army. Price can be raised if people think 10 is too little. It spawns 3 instead of 1 to keep consistent, but it can be lowered to 1 spider.
2019-06-22 10:31:28 +12:00
oranges
ce1575de23 Merge pull request #44668 from ike709/imaginehavingadminsenforcearulethatcouldeasilybeenforcedinthecode
Allows blacklisting words from IC chat via config
2019-06-21 11:42:58 +12:00
ShizCalev
d4a3f06ecb Merge pull request #44666 from Arkatos1/SlimeHUD
SlimeHUD
2019-06-20 18:09:42 -04:00
Rob Bailey
a9e86b116d Revert "[READY] Migrates some legacy movespeed stuff to modifier movespeed (#44256)"
This reverts commit 4df44f4e3d.
2019-06-19 23:12:42 -07:00
Unknown
c04774f487 Da Rulez 2019-06-19 21:22:09 -06:00
Unknown
62edbcf64f Satisfies the fruit 2019-06-19 19:48:08 -06:00
Unknown
8506f515ed derpspeech -> forced, and check it sooner 2019-06-19 18:46:34 -06:00
Unknown
8e65bb63c4 Config 2019-06-19 18:39:34 -06:00
Unknown
9edd97eb86 Allows gibbering people to still use netspeak
One of the brain damage lines would've been blocked.
Also adds a few more instances of netspeak.
2019-06-19 15:48:07 -06:00
Unknown
e1aadd290b Blocks netspeak in IC 2019-06-19 15:18:42 -06:00
Shaps
8954265573 Agender fixes (#44597)
Credits to Europaisch for help finding all the records stuff

Fixes a few issues I was not aware of with my initial PR

* Being agender is now a distinct DNA value (fixes agender spessmen
  turning female when having their DNA referenced, like during cloning
  and some rudimentary transformations)
* Neatens up preference code, more in line with previous code, fixes
  an issue with male underwear not surviving preference loading and
  defaulting to female underwear
* Allows agender spessmen to change their facial hair with mirrors
* Change medical, personnel, and security records from sex to gender
  and add "Other" option (they currently display "plural" even for
  agendered species like ethereals)
* The -san honorific now applies to plural gender instead of just
  neuter with the Chinese Cartoons admin secret (highly important)

I have never really played genetics and only tested the DNA code with
cloning and rudimentary transformations while still in a body (which
causes it to reference the old body's DNA, like with cloning). Please
let me know if there's a better way to do this and/or if this is apt
to create issues.
2019-06-19 13:59:39 -07:00