Commit Graph

383 Commits

Author SHA1 Message Date
oranges 8c8e618804 Merge pull request #45694 from AutomaticFrenzy/patch/fix-stupid
Remove atom creation in vending machine icon generation
2019-08-09 11:11:24 +12: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
Tad Hardesty f1f9d604dc Remove atom creation in vending machine icon generation 2019-08-03 13:30:38 -07:00
nervere d9abd3930a adds jojo hat (#45451) 2019-07-26 17:42:56 -07:00
nemvar fa0c53f89b This var didn't exists. (#45510) 2019-07-26 16:10:02 -04:00
MMMiracles cded323274 Adds Hat Throwing (#45355)
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
2019-07-26 15:23:56 -04:00
tralezab fe0f959956 Remove an overused neme from the game (#45421)
grow up you fucks
2019-07-24 18:02:41 -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
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 698fb9c080 Antimagic now gets used up once it loses all charges (#44956)
Also makes the tinfoil hat load correctly if varedited in the DMM.
2019-07-04 13:04:20 -07:00
ShizCalev 6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
Twaticus 0cd4ca69a5 Department Skirts (#44776)
About The Pull Request

Adds department skirts to all related lockers/vendors

Why It's Good For The Game

Skirts good
Changelog

cl
add: added department skirts
fix: fixed secskirt dixel
/cl
2019-06-29 21:01:44 +12:00
kingofkosmos c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
kingofkosmos ebf787a97a * "You should..." and "You must..." 2019-06-26 06:13:32 +03:00
XDTM 114628ad7c Fixes antimagic not working in hand slots (#44606)
* Fixes antimagic not working in hand slots

* proper changes

* Update code/modules/mining/lavaland/necropolis_chests.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-06-24 10:31:11 -04:00
Tlaltecuhtli d3dd48de46 fixes russian helmets not holding vodka (#44692)
* 1

* no need for this

* e

* dsdag
2019-06-22 02:17:55 -04:00
vuonojenmustaturska 8ddc9677c7 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-06-19 22:07:57 +02:00
vuonojenmustaturska 2d74a86353 [READY] Cleans up saycode by removing random hook stubs and using a signal where relevant (#44320)
About The Pull Request

This PR removes speech message and span hooks from dna, mutations, pierrot throat disease, species, tongues, masks, hats, held items, brain traumas and a carbon proc overload handling tonguelessness.

Tonguelessness is now handled by tongue removal registering for the speech signal and the hook being deregistered by having a tongue put in.

Also cleans up some /atom/movable/proc/get_spans() overloads that called the empty parent or overloaded the parent to do the exact same thing as the parent proc did.

Also cleans up calls to radio.talk_into() where the caller would often, as a result of copypasta, provide the proc with fresh copies of the proc's default values for proc args, and makes say_quote() better by giving it a default spans value so that none of the callers have to provide the same default one.
Why It's Good For The Game
Changelog

cl Naksu
code: Cleaned up saycode
/cl

* start with this

* oh man this looks so good

* hats are dead

* /obj/item/proc/speechModification is dead

* brain traumas and get_held_item_speechspans() are dead

* these should be static

* unfortunately we still need this

* /mob/living/carbon/treat_message(message) is kill

* clean up get_spans()

* dunk get_spans, modifies_speech for brain traumas, some superfluous static stuff

* move stuff around

* return values
2019-06-06 18:35:06 +12:00
ninjanomnom 702a3edac3 HAS_BLOOD_DNA doesn't include the if check 2019-05-31 15:30:07 -04:00
Ghom 17b3091867 Merges tinfoil (hat) protection into the anti_magic component. Implements it on Hivemind gamemode and telepathy. (#43978)
About The Pull Request

Was fairly shocked to find out hiveminds never took tinfoil hat protection in account, so decided to implement the factor in the game mode. Might have overdone it and probably erroneously changed a couple logics while getting rid of some really indented passages that could easily early return.
So what's said on the tin, this is lot more preferable than clunky is_type() checks on headwear anyway.
Also expanded tinfoil protection to hivemind and (non-revenant) telepathy.
Why It's Good For The Game

Let us remember the "purpose" of tinfoil hats.
Changelog

cl
code: Merged tinfoil hat kind of protection into the anti_magic component.
add: Tinfoil hats can also be warped up from excessive dampening of mindray/though control/psicotronic anomalies, or by simply being microwaved in an oven, and become useless.
add: Immortality Talisman and Paranormal Hardsuit helmets now come with tinfoil protection too (minus the paranoia and limited charges).
balance: Rebalanced many hivemind effects to be dampened/delayed by tinfoil shielding. Bruteforced Assimilate Vessel, One mind and Awake Vessel abilities will consume more tinfoil charges compared to others.
balance: Genetics/Slime/Alien Telepathy and Slime Link are now stopped by tinfoil protection.
/cl
2019-05-30 20:29:30 +12:00
Akrilla 55ed0ebf35 Fedoras hold small and gimmick items (#44139)
* This was probably originally intended...

* Fedoras hold small items, and exceptions for gimmicks

* Only create cache once

* Cache exception_hold, and adds other katana type
2019-05-28 09:57:59 -04:00
imsxz 33bfec841b cakehat nerf 2019-05-17 12:15:44 -04:00
Farquaar 4d37b82fbd Fixed rastacap icon_state (#43938) 2019-05-12 15:16:15 -04:00
Farquaar 3dbc8c3c12 Adds a Bunch of New Religious Clothing Items (#43841)
* Adds the rasta beanie

* Added Bishop Mitre

* Added some more religious headgear

Clown Mitre (Hat of the Honkmother)
Kippah
White and Red Taqiyahs
Medieval Jewish Hat

* Fixes icon_state for the Hat of the Honkmother

* Added some new chaplain outfits

Bishop Robe
Monk's Frock (with hood)
Eastern Monk's Robe
White Robe

* Added Robes of the Honkmother

* Added new religion hat icons

Bishop Mitre
Clown Mitre
Kippah
Red and White Taqiyahs
Medieval Jew Hat
Rasta Beanie

* Added new religion suit icons

Bishop Robe
Monk's frock
Eastern Monk's Robe
White robe

* Added new religious suits

* Added new religious headgear

* Added in-hand sprites for new religious suits

* Added new religious clothing to the chaplaindrobe

Includes new premium and contraband objects.

* Added clown priest's robes to premium

* Added some religion follower hats

Kippah
Taqiyah (red)

* Added rastacap to the chaplain vendor

* Fixed obj directory for red taqiyah

* Fixed spelling of "dreadlocks

* Allowed clown robes to hold prank items

* Created .dm for chaplain suits

For easy organization

* Removed clown priest robes

Put them in chaplainsuits.dm

* Moved new chaplain suits

To chaplainsuits.dm

* Moved holiday priest

to chaplainsuits.dm

* Moved holiday priest to chaplainsuits.dm

* Updated suit obj defines, added monk's frock

* Updated obj defines for chaplain suits

* Updated holiday priest obj define

* Updated chaplainsuit obj defines, added white robes

* Fixed subtype define

Man, that was an embarrassing spelling mistake

* Fixed subtype define

For real this time I hope

* Added chaplainsuits.dm

* Fixed clown robes

* Updated holiday priest path

* Updated path for chaplainsuits

* Re-added prank items to clown robe storage

* Updated pathing for chaplain suits on Pubby

* Added comments

Hopefully this will help the AppVeyor check go through
2019-05-10 15:01:45 -04:00
oranges 47f4738993 tinfoil hat can nolonger be clickdragged off (#43890) 2019-05-10 10:09:19 -04:00
vuonojenmustaturska fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
nemvar 49c42c63d0 Nerfs surplus russian gear. (#43688)
* Passive aggressive nerfs

Yeah no. Those values were retarded

* Update syndicate.dm

* Update armor.dm

* Update packs.dm

* Update packs.dm

* Rad protection for helmets.

* Life in the zone is hard
2019-04-24 20:02:39 -04:00
pireamaineach b96dbc1508 Beret Resprites Mk. II (#43543)
* FuCK

* Beret Resprites

* e

* Adds the archaic and vintage berets.

* Grammar fix.

Just misspelled allegedly.

* Grammar fix.

* Modifies the beret to bring it a bit more off the eye.
2019-04-10 12:17:16 -04:00
Tlaltecuhtli ec1ad61558 new cargo crates & tweaks (#43454)
* 1

* 2

* finall pre pr

* oof

* oof

* testing merge conflict fix

* test mk2

* test mk3

* plant & chem

* bvcgr

* fixed stuff

* grammar stuff

* fixes clothing + cobby bribe

* new sprites by wjohn

* Update code/modules/clothing/suits/armor.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* tweaks .38 stuff

* Update code/modules/cargo/packs.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* nuclear option
2019-04-03 14:23:38 -04:00
tralezab 0a51e7e1b9 [PROBABLY READY? REVIEW WITH SCRUTINY] New event: Fugitives (#42554)
* fugitives

* lets make this a bit cleaner

* cultists and the beginnings of security detail, lots of wip

* wip security

* WALDO (and some more work on yalp, of course)

* adding antagonist teams for both hunter and fugitives, roundend report beginnings

* this whole file is shit, but hopefully a little better

* it compiles (+ space police)

* some more work

* S.E.L.F. fluff

* grammar and icon fixes

* lets finish yalp elor, give it the justice it deserves

* moves hunter spawns to ship pods + russians P1

* moves hunter spawns to ship pods + russians P2

* fugitives and hunters now recognize eachother

* hunter spawning finished(?)

* missed this

* ATH's review

* runtime fixed, added yalp's transport ability

* anturk's review

* makes hunter.dm better trust me

* oopsies

* INVOKE_ASYNC

* russian ship + finally a (bad) sprite for the capture machine

* step > pixel, thanks travis

* mooshroom review p1

* mooshroom review p2

* improper use of /improper

* waldo's radio doesn't stick, police id

* candidate picking is more flexible + minor things
2019-03-06 10:17:46 -05:00
Mickyan e831716127 Hairstyling update (#42907)
* good hair day

* fluff

* vendor/fixes

* removes redundant loc check

* cobby reviews
2019-03-05 12:23:00 -05:00
Vile Beggar 313db3ad8b Tweaks the drill hat to be a bit less annoying (#42655)
* does the tweaking

* indent fix

* adds more canadian variety

* no longer mr politeman

* adds cobby's review suggestion

* gets rid of mutation defines

* makes it use speechmod

* removes accidental letters

* gets rid of unneeded comma in .json

* changes magic number into defines

i hope it's supposed to be like this

* compile fix

* gets rid of yelling define in dna.dm

* removes unneeded line in .json
2019-02-09 22:26:49 +11:00
coiax e65e50e8d9 Traumas are copied when a person is cloned (#41852)
* Traumas are copied when a person is cloned

🆑 coiax
add: When a person is cloned, any mental traumas are cloned as well.
/🆑

If the cloner is going to recreate your delicate personality, it's going
to have to recreate anything wrong with your brain as well. After all,
where does one greytider's legitimate fear of security end, and another
one's irrational fear begin?

Essentially, traumas could be easily gotten rid of by cloning, or death
would rob a person of a rare positive trauma. Now you're stuck with them
until you get rid of them.

* Suggested changes
2019-01-30 11:36:20 -05:00
Name 004792ba05 Rebase due to mime trickery
Cuts something that should be there


hardens pp


largens pp further


maximiezes pp 


fixes code


Auto stash before merge of "forth-times-the-yeah" and "BuffEngineering/forth-times-the-yeah"
Adds Initialize()


First Draft

Mostly works
Removes redundant code, adds other colors, adds to CE locker


oops forgot to


hardens pp


maximiezes pp 


Adds Initialize()


Auto stash before merge of "forth-times-the-yeah" and "BuffEngineering/forth-times-the-yeah"
oops forgot to


Attempts to balance the hardhat, adds to EngiDrobe


Removes unnecessary code and sprite, adds necessary sprite


How can commas be real if our eyes aren't real


Fixes bad slash


Fixes runtime


Optimizes code after runtime fix


Removes redundant code


Fixes 3/4


*scream


Makes visor coverage consistent with new sprites


Actually fixes the issue


samus? its an honor


Makes requested changes


Doesn't delete welding hardhat sprites
2019-01-28 16:28:40 -05:00
pireamaineach 1b670a9c36 Mime-related tweaks. (#42508)
* Mime-related Tweaks

Improves upon the standard beret sprite, aswell as the rest.
Changes the sprite of the french beret to the classic maroon colour, matching the mime's suspenders.
Remove's the mime's pocket protector as it's either rarely used do to the lipstick being nearly useless to mimes, since they spawn with a mask or alternatively, removed.

* Removes the standard beret from the standard costume crate.
2019-01-28 03:14:47 -05:00
Vile Beggar c98d9d054b Properly adds a drill sergeant hat to the warden's locker (#42533)
* does the thing - please work

* adds it to the locker

* remove var/datum

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* Update code/modules/clothing/head/jobs.dm

adds space

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* adds denton's review suggestion

it's a webedit but i tested it and it worked

* makes it a bit less annoying

* grammar fix
2019-01-28 03:10:57 -05:00
coiax 881e8c1ab9 Refactors NODROP flag into TRAIT_NODROP (#42109)
* Refactors NODROP flag into TRAIT_NODROP

🆑 coiax
fix: Anti-drop implants can no longer be used to drop objects that they
were not responsible for sticking to a person's hand.
fix: Backfiring with a Barnyard spellbook will now play a spooky horse sound.
refactor: Refactors the way that "NODROP" items work to a new system,
there should be no change in functionality.
/🆑

Various items in the codebase were doing weird hoop jumps in order to
preserve the nodrop flag's state when it also wanted to change it, so I
moved it to a trait system.

I may have gone overboard with the type of unique trait sources, but
those can be changed later. My long term plan is make a general "CURSED"
nodrop origin, which means you can unlock cursed items by being hit with
a bolt of door opening or something. But that's for another PR, this has
no functionality changes, apart from some slightly modified descriptions
on cursed masks.

- Removed a bunch of redundant voice changing code for all the voice
changing animal masks, used two new clothing flags for this purpose.
- Also refactored a bit the animal masks, making new cursed subtypes that play
the sound when created.

* Drop location
2019-01-17 15:24:30 -05:00
duckay 5c79d91f0b About that beer I owed ya. Adds blueshirt items to sectech and defines them better. (#42203)
* beer

* beer

* beer

* beer

* beer

* better descriptionhelmet

* better descriptionarmorname

* blue-shirt

* Update security.dm

* beer

* hey catch me later i'll buy you a

* thanks cobble

Co-Authored-By: duckay <41324849+duckay@users.noreply.github.com>

* helpies

* helpies

* discount for meme helmet

only 450 whoppers!
2019-01-04 15:12:34 -05:00
Qustinnus 62f61a5867 [READY]New durathread content and durathread modifications (#41959)
* durayeet

* Update code/modules/clothing/head/jobs.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/head/beanie.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/masks/miscellaneous.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/under/miscellaneous.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* yeet

* adds armor

* webedits yeet

* adds crafting stuff and removes normal cloth crafting

* ff

* final fixes

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* done
2019-01-02 14:31:06 -05:00
coiax 9f3e9a6960 Trauma bug fixes, stalking phantom balance (#42020)
* Traumas are copied when a person is cloned

🆑 coiax
add: When a person is cloned, any mental traumas are cloned as well.
/🆑

If the cloner is going to recreate your delicate personality, it's going
to have to recreate anything wrong with your brain as well. After all,
where does one greytider's legitimate fear of security end, and another
one's irrational fear begin?

Essentially, traumas could be easily gotten rid of by cloning, or death
would rob a person of a rare positive trauma. Now you're stuck with them
until you get rid of them.

* Suggested changes

* Removes cloning traumas

* No more cloning traumas
2018-12-23 16:52:47 +11:00
xmikey555 31386f8f93 Pirate language (#41489)
cl
add: Added pirate language, equip a pirate hat to speak it.
/cl

I haven't made a PR here since #23676 but this is pretty simple, it just adds "pirate language" (language only spoken/readable by fellow piratespeakers that looks like pirate slang to others), and makes the pirate hat (yes, the one obtainable from the autodrobe) grant/remove the language.

also i have no experience in dream maker so i'm at least 87% sure i flubbed something up

thanks to qustinnus for helping me out
2018-11-27 14:31:57 +13:00
ShizCalev fe10959af0 Adds examine messages for helmets & guns with flashlights (and bayonets) (#40998)
cl ShizCalev
tweak: Added examine messages for helmets & guns with flashlights (and bayonets.)
fix: Fixed an issue where you were able to remove flashlights/bayonets that were supposed to be permanently attached to a gun.
fix: Fixed an issue where you were unable to remove flashlights & bayonets from certain weapons.
fix: Fixed a potential issue where adding a flashlight to your helmet would've caused you to lose other action buttons.
fix: Fixed a issue where guns with multiple action buttons would break all but one of those action buttons.
tweak: If you have both a bayonet and a flashlight attached to your gun, you'll now be given a prompt on which you'd like to remove when using a screwdriver on it.
/cl

Shouldn't need to have "pro-gamer tips" in adminpm's just to inform folks that you can remove a flashlight from a helmet with a screwdriver.

Also added some missing handle_atom_del / Destroy logic, as well as moving the clothing can_flashlight & flashlight vars down to helmet level (since they were the only things that utilize them anyway.)

also why the fuck was the helmet flashlight var just called F. hnnnngg
2018-10-27 13:10:37 +13:00
Mickyan d1b10b2691 Vendor tweaks & prices: take 2 (#40927)
* vendor tweaks

* i was never good at cooking

* soda

* boozeomat sorting

* updated ramen desc
2018-10-22 08:40:24 +13:00
swindly 86e77d98bf buffs firesuit 2018-10-09 11:33:16 -04:00
MMMiracles 5ee8a6bb1f Adds clothing production for Botany (#40563)
cl MMMiracles
add: Botany can now grow cotton to produce cloth for various jumpsuits.
add: Cotton can be mutated into a much more durable strand, allowing for the production of crude armor.
add: Rainbow flowers, an alternative for clothing dyeing, is obtainable through cargo's exotic seed crate.
add: A loom can now be crafted with some planks so you can actually weave that cotton into a usable fabric.
add: Fannypacks, softcaps, beanies and scarves are now craftable with cloth and dyeable.
/cl

[why]: A way to produce clothing and naturally obtain cloth past ripping up other stuff seemed useful and with the economy aspect, might actually have some extra use.
2018-10-03 10:13:34 +13:00
ShizCalev 2fa1ac1349 Replaces istypes with the proper tool_behaviour checks. (#40414) 2018-10-01 03:10:31 +03:00
XDTM 3f32f8c110 [Ready]Logs when speech is forced by an external factor (#39964)
* Logs when speech is forced by an external factor

* makes say args uniform

* fix
2018-09-03 11:38:16 +02:00
Poojawa faa3c0257b Fixes Fedora having armor values (#40031)
* Removes Fedora armor values

* Grants detective's hat armor
2018-09-01 15:17:55 +03:00
Grandmother of 50 e53ec2e2b9 [Hotfix] Mime Beret/Traffic Cone doesn't cutoff your hair anymore (#39659)
* Update misc.dm

* Update misc.dm
2018-08-13 02:41:27 -04:00
Tad Hardesty 52eca1a74f Combine fire immunity suit/helm temperature defines 2018-07-29 22:10:49 -07:00