Commit Graph

35 Commits

Author SHA1 Message Date
SkyratBot
49f7becb88 [MIRROR] Personalized combat messages part 2 (#334)
* Personalized combat messages part 2 (#52890)

Adds more "personalized" combat messages for all participants in a fight: the attacker, the victim and the spectators

* Personalized combat messages part 2

* Update misc.dm

Co-authored-by: kingofkosmos <riki.sundberg@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-08-14 23:29:15 +02:00
SkyratBot
8ca4a452f8 [MIRROR] Refactors area stuff (#265)
* Refactors area stuff (#52751)

-bitfielded a bunch of bools on /area, I left some untouched cus they get called a lot
-Unused vars
-Fixed a var pretending to be a fake bool
-Probably more

* Refactors area stuff

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2020-08-10 23:20:00 +01:00
SkyratBot
ee324ab3c2 [MIRROR] Cleanup up all instances of using var/ definitions in proc parameters. (#240)
* Cleanup up all instances of using var/ definitions in proc parameters. (#52728)

* var/list cleanup

* The rest of the owl

* plushvar bad

* Can't follow my own advice.

* Cleanup up all instances of using var/ definitions in proc parameters.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-08-07 18:26:21 +01:00
dragomagol
d41374c959 adds the peacekeeper plush (#51545)
* Adds the Peackeeper Cyborg plush

adds the peacekeeper plush as an arcade prize and roboticist heirloom

* Update plushes.dm

* added trailing newline

* fixes the pkplush addition to robo heirlooms
2020-06-14 18:12:24 +02:00
Fikou
5c88d587b4 removes king goat (#51366)
* Revert "Remodels king goat ruin (#50813)"

This reverts commit 26ffe3d539.

* numba 1

* bye

* bye 2

* bye 3

* fuck bitches get money

* hey this was actually a good change

* goat sounds

* fuck

* h

* waaaaaaaaagh
2020-05-31 17:38:07 +02:00
nemvar
6ef421be42 Renames a few variables. Also reorders icon fallback order again. (#51060)
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
2020-05-25 06:47:19 +02:00
ArcaneDefence
946255412a Adds a suicide to moth plushies (#49878)
* Adds a suicide to moth plushies

The user gets stripped and dusted, adding one to a kill counter

* Adds hellbound check shame state

* Attempts to meet expectations

Adds doc for var/suicide_count, var/divine, removes the shame results, replaces the theme of soul-eating with consuming/killing the user, removes the do_after, and puts the death proc in the dust proc after the unequip so that the plushie doesn't spam the squeak sound for every item the user was wearing.

* Accepting reality for what it is

* Method to prevent squeak spam

* Changes as suggested
2020-03-20 19:08:16 -04:00
RiskySikh
5b66eafd66 Removes the Emag functionality from the Goat Plushie + small fixes (#50023)
* GoatPlushie

Removes emagged plushie

* GoatPlushiePart2
2020-03-17 19:54:12 -04:00
ArcaneDefence
827543aff8 Adds mothperson plushie (#49732)
* Adds moth plushie

Creates and adds a mothperson plushie to the arcade loot table.

* Adds a return I didn't notice I deleted

'cause I don't need to remove things if I don't intend to.
2020-03-06 14:13:56 +08:00
fluffe9911
00043330a0 New King Goat Lavaland Boss! (#48823)
About The Pull Request

This pr adds in a new lavaland boss in a seperate z level arena also included are goat plushies that ram into people and goat skins which you get by butchering goats and can wear on your head, a goat gun that shoots goats and finally multiple tweaks/fixes generally involving possible ways to teleport out of noteleport area and or cheese the king goat.
Why It's Good For The Game

Lavaland has not seen any new bosses for a long bloody time and although the boss may be a bit silly I feel more hardcore players will enjoy the challenge it brings since this is meant to be a very hard boss also new goat related items are always neat.

🆑 Fluffe9911 for porting/making most of it, Monster and Sabiran for the King Goat!
add: A new king goat lavaland boss!
add: Goats now drop skin which you can wear on your head! (coder sprite)
add: Goat themed plushies that ram people! (realistic version sprite by identification code by karma)
/🆑

goat

This is ported over from my work on yogstation with minor changes mostly to make things work there is more goat content I made but didnt wanna do too much at once and dont know if tg would like it
2020-01-29 11:50:27 +13:00
Qustinnus
be23312096 New achievements and achievements icons (#48544)
* sdasd

* fixes

* fixed

* attempt 2

* Update skill_achievements.dm
2020-01-12 18:46:51 -08:00
William Wallace
84808b77c4 remove duplicate var definition in /obj/item/toy/plush/slimeplushie 2019-10-08 23:13:32 +01:00
nemvar
dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07:00
nemvar
8cfe0f6467 Slightly improves visible and audible messages. (#46499)
* Doubtful improvement

* Switches out all the magic numbers with defines

* Thanks travis for finally finding a real error

* properly resolves some left over conflict
2019-09-18 12:52:18 +02:00
ATH1909
5afc95aa62 How can you kill a god? (now separate from my alkali explosion PR) (#46062)
About The Pull Request

This PR adds a Morrowind reference to "divine" plushies (the Nar-Sie and Ratvar plushies).
Why It's Good For The Game

It's a funny (I hope) joke.
Changelog

cl ATHATH
add: Adds a Morrowind reference that occurs if you try to kill a divine plushie.
/cl
2019-08-24 10:54:41 +12:00
YakumoChen
461191d2bd Nar'Sie plush can't invoke now (#44858)
* heresy

removes is_invoker from narsie, removes redundant hugbox version

* double heresy

remove var
2019-06-30 15:25:54 -04:00
ninjanomnom
56196df9c6 Reverts datum outputs
reverts #43038
reverts #41535
2019-06-13 20:09:10 -04:00
Tlaltecuhtli
4a247210fd changes how grenades with custom primer are made (#44258)
* assemblies are shit fuck em

* maybe press commit before making a pr

* proxy stuff

* morestuff

* qol stuff

* only 1 wire

* revert that garbage that made me conflict

* changes

* wires
2019-06-11 12:28:35 -04:00
nemvar
c44120b5d1 Adds bee plushies (#44342)
* Adds beeplushies

* makes the behind less pure black

* Newline
2019-06-07 13:55:02 -04:00
Militaires
3ff0287d90 [READY] Outputs Datum Cooldown: For Real Guys This Time (#43038)
cl Basilman
fix: Added a cooldown for datum outputs
/cl

also added an arg called do_owner in playsound that lets the owner of a datum output be different from the atom that plays it, chiefly used for component/squeak so that you can apply the component directly to any single atom without having to fuck with said atom's datum_outputs list so that it can properly play the sound, since the datum output is already stored within the datum component itself.

also send_info now returns true or false based on whether it's cooling down or not, i dont like this and i initially just had a var for whether it's cooling down or not but raz said it saves a var so i guess whatever ill just have it like that
2019-04-03 10:48:37 +13:00
Militaires
cecf676684 [Ready] Outputs datum (#41535)
Idea and instructions by @Razharas, many thanks.

This PR only implements the framework required to catalog as well as play the sounds. Their to_chat text, and icons (if any) are not included, are to be pushed in a separate PR.

This PR does not remove the old playsound_local system, it is kept for the sake of not necessitating a direct changeover of every single playsound in the code, which will surely cause a lot of merge conflicts. It does however, replace bike horns' and toy nukes' means of playback to this datum, purely as proof of concept.

Playsound_local may remain in the code to support playback of admin-uploaded sounds that do not have an inherent datum. Playsound will likely be renamed to something else in the next PR to reflect its new, more universal function. We will see.

New process for adding sounds:

    Create a new datum/outputs subtype.
    If you wish, write down some supporting text; this gives further meaning to the sound.
    Add multiple sounds to the sounds list, and weight them as you wish. (New)
    Add a sound icon if you wish, it defaults to a generic sound circle anyways though.
    playsound(/datum/outputs/new_subtype, receiver), and it will deliver, icon, sound, and text to the receiver.

Maintaining implication is that from now on playsound should only be processing datum/outputs

This pr intends to gut to_chats that are added alongside playsounds in the code.
This pr eliminates the need to initialize sounds in a list so that you can weight them or have the game play them randomly from the list.

Sound Rings
Currently, only mobs with the audiolocation var may view them. Sound icons have an alpha that depends on the volume of the sound, louder sounds create a more opaque image

Sound rings are completely modular and may be changed to any image.

In addition to renaming playsound to reflect its new function. I intend to give blind people sound icons at the cost of their small view, but that is for another PR.

cl Basilman
refactor: refactored how sounds are stored and played
add: Added sound rings and supporting text
/cl
2019-02-04 10:25:48 +13:00
skoglol
43400155ec Some plushie grammar fixes (#42003)
Fixed Bubblegum plushie attack verb, Ratvar and Bubblegum plushie
capitalization.
2018-12-22 13:21:24 -08:00
bgobandit
a939173d57 this kills tactical carp fucking (#40770)
Fixes #39371.

I left the stuffing thing alone because it is both funny and not a TC exploit
2018-10-17 23:23:54 +13:00
ShizCalev
8a7df8ba45 Makes usage of Nar-Sie consistent (#40029)
cl ShizCalev
spellcheck: Nar-Sie's name has been revised to Nar'Sie.
/cl
2018-09-08 13:31:09 +12:00
ninjanomnom
71e2354d48 Adds global signals and a silly example use case 2018-06-18 03:06:09 -04:00
ShizCalev
c41d6ac965 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-30 21:57:06 -07:00
astralloop
22ad3835e7 A Nar-Sie Plushie can be used an an extra invoker now! (#35932)
* A Nar-Sie Plushie can be used an an extra invoker now!

you can't use 9 nar-sie plushies to invoke a rune, nar-sie plushies are only counted once

* Update runes.dm

* Update plushes.dm

* Update plushes.dm

* Update runes.dm
2018-02-27 03:29:55 -05:00
ACCount
c6e607dc17 Refactors use_sound and changes the way tools play sounds (#35521)
* Adds list support to usesound, ports drills to usesound

* Adds more tool sounds, changes usesound usage to play_tool_sound

* fix
2018-02-12 17:16:47 +02:00
Trevor Serpas
45dbba922e Reduce the volume of the death sound on clock work mobs (#34452)
* Reduce the volume of the death sound on clock work mobs

I edited the .oog since I did not see a way in the code to lower the volume. This will affect all code/game/gamemodes/clock_cult/clock_mobs which at this moment is only maraders and the eminence.

* Non-clockwork mobs are no longer affected

adjusted volume in the code so that the clockwork golems, ratvar, and ratvar plushies are unaffected by the audio file changes
2018-01-19 15:58:05 +01:00
CosmicScientist
502905f7ac Plushie relationships! (#33184)
* Kor and Bubblegum, sitting in a tree

* complying with oranges' review

* remove the, moves mood setting to make_young, dots Ts, crosses eyes
2017-12-03 00:48:59 +13:00
Ashe Higgs
07c7727e82 Plush Ratvar can now fight plush Nar-Sie (#32046)
* Plush Ratvar can fight plush Nar-Sie

* Maintainer review

* Qdeleted checks
2017-11-07 09:43:11 +13:00
Ashe Higgs
695fa5f220 You can now hide grenades in plushies (#31986)
* Adds plushie grenades

* Now it compiles!

* Cyberboss' review

* Adds logging, handle_atom_del

* ..()

* Logs without user

* Webeditor 1!

* Webeditor 2: Return of Webeditor
2017-10-30 15:32:52 -04:00
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
TehZombehz
b4f2533359 Adds some new plushies (#30751)
* Adds some cartoony plushies

Adds some more cartoony plushies and adds them to the toy crate.

* Conflicts 1

* Conflicts 2

* Conflicts 3
2017-09-20 08:53:21 +12:00
Emmett Gaines
76c08c601a New squeaky datum and plushes (#30710)
* New squeaky datum and plushies

new plush subtype
clown shoes, bike horns, and mice slightly changed to use the datum

* narsie and ratvar plushes

* fixes duplicate obj/item/attack_self()

and other misc requested changes

* moves the sounds into initialize
2017-09-18 12:49:03 +02:00