Commit Graph

60 Commits

Author SHA1 Message Date
Akrilla 809be06373 [TMC] Baton rework (#45377)
* stun

* stamina tweak

* 5 units

* 2 hits even with chem

* Update stunbaton.dm

* This is a good slowdown

* new chem + confusion

* overdose

* h

* update

Co-Authored-By: JJRcop <jrubcop@gmail.com>

* less cheap

* better overdosing

* typo

* *=

* confused

* overdose tweaks

* tweak

* no var

* typo

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* *

* tweaks

* stamina batons

* knockdown

* Update code/game/objects/items/melee/misc.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* number tweaks

* maint

* 2

* cooldown and less stuntime

* tweaks

* conflict

* text
2019-08-14 14:59:46 -04:00
kingofkosmos c3ea51908d Adds "you" to local visible_messages (#45631)
* adds "you" to some combat visible_messages.

* more you-messages and attack verbs to present tense.

* small fixes

* more additions and small fixes

* few message tweaks

* Fixes a typo and few other wordings.
2019-08-06 02:15:34 -07:00
nemvar 449e5d38e6 This turns butchering into something that resembles a component. (#45299)
* This turns butchering into something that resembles a component.

* Changes how the recycler works.
It no longer uses butchering in disgusting ways.

* I guess this works? It's not pretty though.

* How the fuck...
2019-07-26 23:57:37 -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
wesoda25 0632fed795 Nerfs Beekit + Beesword (#44892)
About The Pull Request

Beekit now gets one less beenade and has a lower chance, beesword has worse armor pen, does 2 less damage and injects 4 toxin as opposed to 4 histamine (could be looked at as a buff though). Plus I removed some pointless // remarks that I previously made but I doubt that really matters
Why It's Good For The Game

Pretty overpowered, hopefully this will make things better.
Changelog

cl
balance: Beekit now has a lesser chance of spawning and has one less grenade
balance: beesword now does 2 less damage, has worse armor penetration, and injects toxin as opposed to histamine
/cl
2019-07-19 22:49:11 +12:00
Akrilla 4dda76b8f1 [READY] Contractor Hub (#45117)
* Contract Hub + Pinpointer + more contracts

* Show rep

* Better errors

* Dynamic hub

* Bug fixes

* Show items

* No html in desc

* compile

* contractor support

* limit

* allow limits of 1

web edit

* Equip and send partner + turf helper

* working reinforcements

* Cleanup

* removing debug

* blackout

* test

* Working buttons

* no debug

* prelight

* finalized interface

* better fit

* hub icon

* conflict

* text

* error

* kit tweaks

* items

* fixup

* fixup

* bugfix

* ui fix
2019-07-15 20:36:54 +02:00
nemvar fa9e44d937 Reorders the items and weapons dmi. (#45128)
* Reorders the file

* Take 2

* Whoopsie
2019-07-14 12:03:14 +02:00
Akrilla 1d5d26e845 stun animation (#44991) 2019-07-08 23:39:18 +10:00
Rob Bailey 639ebd2dfe Fix sabre sheath sounds (#44972)
Fixes an ancient bug where the officer sabre was not playing sounds
when being drawn from or put into the sheath.
2019-07-04 20:39:36 -07:00
Akrilla b2b91a2875 Contract tweaks (#44869)
* Payment generation rework and no repeated target

* Blacklist

* Remove pod explosion

* contractor baton

* darker highlight

* Slight increase for the higher paying contracts

* Victims get healing injected to bring them out of soft crit/crit

* pod send fix

* Text changes

* More text tweaks

* New baton - custom sprite/sound

* Better sound - fixes

* Stutter

* text

* classic_baton rework

* attack silicons still, and only show charging for new baton

* Properly attack/stun silicons where appropriate

* . list
2019-07-03 22:32:40 +02:00
kingofkosmos c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +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
nemvar 8d5807d610 Fixes the stupid beesword thing (#44740)
* Fixes the beesword

* stupidpronoun
2019-06-25 15:32:04 +02:00
Tlaltecuhtli b642ed67a7 the stinger (#44515)
buzzes profusely at the really bad commit names
2019-06-20 20:58:13 -04:00
wesoda25 67c2434a21 Adds lots of New Items to Syndicate Kits (#44509)
* Update uplink_kits.dm

* fucking stupid man

* Update energy.dm

* Update uplink_kits.dm

* Update special.dm

* Update special.dm

* Update misc.dm

* Update special.dm

* Update misc.dm

* makes hacker better
2019-06-18 23:22:57 -04:00
Emmett Gaines c3f95024b2 Gets rid of the GetComponent macros (#44220)
* Removes the GetComponent macros

* Regex replacement for GET_COMPONENT

Search: `GET_COMPONENT\( *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = GetComponent($2)`

* Regex replacement for GET_COMPONENT_FROM

Search: `GET_COMPONENT_FROM\( *(.+?) *, *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = $3.GetComponent($2)`
2019-06-04 17:39:58 +02:00
vuonojenmustaturska fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
AnturK d81ff09046 Atmos adjacency subsystem revival (#43447)
This improves init times and makes explosions and other shit that modifies a bunch of turfs faster by saving a proccall and potentially not doing the same work more than once.

cl Naksu
code: Turf adjacency list updates are now handled by a subsystem queue
/cl
2019-04-24 21:21:25 +12:00
cacogen 25170d79a5 Makes stun baton two words (#43126)
* Update stunbaton.dm

* Update inventory.dm

* Update misc.dm

* Update inventory.dm

makes the capitalisation in the comments consistent
2019-03-15 14:00:31 -04:00
kevinz000 7370de6961 Fixes projectiles not hitting people resting, a bit of refactoring of how projectile target collision is done (#42241)
* Fixes projectiles not hitting mobs, some refactoring too

* some stuff for projectile can hit target to work with not being ontop of an object

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* CanPass returns true to projectiles regardless of hit

* snakecase?
2019-01-19 11:17:42 +13: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
4dplanner c84a92f4ce Passes thrownthing to hitby (#41411)
* Passes thrownthing to hitby

* Items now also pass thrownthing

* No longer uses default arguments

Also fixes bananium shield

* Adds more arguments to hitby calls

* Standardises throw_impact

* Clears up some loose ends

* Adds back wacky comment

* Reinstates can_push=FALSE on bananium shield
2018-11-15 10:25:04 +01:00
ShizCalev 2088a9ce90 Cyborg modules now automatically turn off when deactivated (#41326)
* Cyborg modules turn off when deactivated

* gives mining borgs built in mining scanners
2018-11-13 01:53:14 -05:00
ShizCalev 60133f90ab Fixes gibs not being passed mob DNA (#41374)
* Fixes gibs not being passed mob DNA

* Cleanup, fixed map-placed gib spawners having no DNA
2018-11-10 14:24:12 -05:00
kevinz000 3e7184c975 Combat/Stun (slip) overhaul staging, mobility flags, adds crawling (#39967)
Aiming to implement the framework oranges has detailed in https://tgstation13.org/phpBB/viewtopic.php?f=10&t=19102
Moves canmove to a bitflag in a new variable called mobility_flags, that will allow finer grain control of what someone can do codewise, for example, letting them move but not stand up, or stand up but not move.

Adds Immobilize()d status effect that freezes movement but does not prevent anything else.
Adds Paralyze()d which is oldstun "You can't do anything at all and knock down).
Stun() will now prevent any item/UI usage and movement (which is similar to before).
Knockdown() will now only knockdown without preventing item usage/movement.
People knocked down will be able to crawl at softcrit-speeds
Refactors some /mob variables and procs to /mob/living.
update_canmove() refactored to update_mobility() and will handle mobility_flags instead of the removed canmove

cl
rscadd: Crawling is now possible if you are down but not stunned. Obviously, you will be slower.
/cl
Refactors are done. I'd rather get this merged faster than try to fine tune stuff like slips. The most obvious gameplay effect this pr has will be crawling, and I believe I made tiny tweaks but I can't find it Anything I missed or weird behavior should be reported.
2018-10-11 11:22:21 +13:00
ShizCalev 2fa1ac1349 Replaces istypes with the proper tool_behaviour checks. (#40414) 2018-10-01 03:10:31 +03:00
Patrick Chieppe 2c8248575a Logging system refactor and improvement (#39521)
* Refactor several log lines to use datum_info_line and atom_loc_line

* Add default return strings from datum_info_line and atom_loc_line

* Add parentheses around atom_loc_line data

* Change more logs to use atom_loc_line

* Add check in atom_loc_line for turfs to avoid calling get_turf on them

* Re-add removed 'at'

* Replace datum_info_line with key_name and atom_loc_line with loc_name

* Refactor logging functions

* Avoid double-logging self-interactions

* Fallback to simple stringification if all else fails in key_name()

* Rewrite muscle spasm logging to use log_message

* Standardize logging of martial arts

* Tweak individual logging panel look

* Fix individual logging panel source

* When I typed || I really meant &&

* Fix Telecomms logging always showing client logs in the panel

* Reverts addition of buggy ownership log to panel

* Remove colon

* Fix missing log_directed_talk tag

* Add warning for missing type in log_direted_talk

* Change warnings to stack_traces

* Add square brackets around fallthrough key_name() case to help parsing

* Allow atom arguments/src in log_*() functions

* Change log_combat call with null argument to log_message

* Change mecha types' log_message() arguments to match atom and mob version

* Add key_name() case for atoms

* Fix resist_grab() unsetting pulledby before log_combat gets a chance to use it

* Fix log_globally logic

* Add logging for hitting objects with items

* Move log_combat() to atoms.dm

* Use utility functions for object stringification in log_combat()

* Use utility functions for object stringification in log_combat()

* Add missing logs for interacting with display cases

* Rewrite log_combat() comment

* Add missing space in log_combat()

* Add logging for hitting grilles barehanded

* Add missing ..()
2018-08-12 21:41:09 +02:00
obscolene 7af93823ec Curator's whip now makes a whip crack sound effect (#39240)
A leather whip makes a cracking sound, not a metal chain sound
2018-07-22 03:47:13 -04:00
Jordan Brown 96c92d5eb7 Merge pull request #38938 from ninjanomnom/b-b-bump
Converts collide back to bump and fixes double bumping in another way
2018-07-09 14:50:27 -04:00
ninjanomnom 059da44453 Converts collide back to bump and fixes double bumping in another way
This is in preparation for step_x support as the default behavior for these procs is necessary for proper functionality.

turf/Enter and atom/movable/Move default code got rewritten to replicate default byond functionality with minor changes.
2018-07-07 11:22:29 -04:00
Trevor Serpas bee0b5b2c3 Afterattack() Signal (#38606)
* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
2018-07-07 02:00:25 -04:00
ShizCalev 89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
cinder1992 9e5769be7b Added Officer's Sabre suicide (#38662)
* Added Officer's Sabre sucide

* Oopsie

* Brute for the Brute God!

* pick_n_take is a thing

* Cleanup

* Cleanup 2: Electric Boogaloo

* Sabre suicide covers all arms and legs

* Suicides now take the same ammount of time for users with more than two arms and two legs
2018-06-24 10:44:27 -04:00
ShizCalev ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
ShizCalev ba1030f803 Makes more messages pronoun sensitive (#37582)
* Makes more messages pronoun sensitive

* Some cleanup

* more pronouns

* rever
2018-05-03 18:45:55 -04:00
AnturK 4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
Fox McCloud 057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00
PKPenguin321 02f9740696 Esword cig lighting messages fix (#37216)
* fix esword cig lighting message

`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`

* fix desword cig lighting message

`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`

* check fix

* desword check fix

* suggested message replacement

* suggested message change desword
2018-04-16 20:19:42 -04:00
iksyp 910eb893b9 The supermatter crystal is now the parent object of the supermatter shard, rather than the other way around (#37025)
*every mention of /obj/item/machinery/power/supermatter_shard in the code should have been replaced with /obj/item/machinery/power/supermatter_crystal and it's variants.
*supermatter shard has been moved to /obj/item/machinery/power/supermatter_crystal/shard
*variable changes like gasefficiency and explosion_power has been switcharood in order to keep it in line with the game as of now
2018-04-11 22:18:49 +12:00
Ian Turk fbe5f4a062 Replaced body zone magic strings with defines 2018-03-19 15:44:51 -05:00
Cruix 7639492389 Added clown ops game mode, and several clown weapons. (#36459) 2018-03-17 02:40:53 -04:00
vuonojenmustaturska 5460c077ef Advanced roasting sticks, for cooking sausages (#36071)
* stick

* a commit

* almost forgot something

* seems to compile
2018-03-04 22:41:16 +01:00
kevinz000 0161fc5a78 Fixes transforming weapons runtiming due to no butchering component (#36057)
* Transformation weapon fix

* Infact lets fix this too
2018-03-04 21:57:57 +01:00
Ashe Higgs 7c38e7eac3 Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-26 09:50:16 +13:00
Jordan Brown d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
vuonojenmustaturska 2871b70733 /obj/item var cleanup (#34909)
* draft 1

* Update energy.dm

* Update twohanded.dm

* Update weaponry.dm

* Update ninja_stars.dm

* Update cult_items.dm
2018-01-25 22:44:32 -05:00
XDTM 5a08a3aad0 Extends the disability refactor to include more traits, removing some snowflake code (#34664)
This way you can add/remove traits without fear of other sources overriding them. Now you can add TRAIT_STUNIMMUNE to somebody without what if hulk

Notable changes:

    Fakedeath now updates instantly, instead of waiting for the next life tick.
    Fakedeath now sets time of death when acquired.
    Removed extremely snowflake code in reagents that checked if you had morphine to remove slow immunity and so on.
    Hulk no longer overrides status_flag changes, in case there are any.
2018-01-25 09:12:44 +13:00
vuonojenmustaturska 6406896df1 Replaces a bunch of obj vars (and emagged on machinery/items) with obj_flags (#34078)
* It works, but is it worth it?

* bitfield helpers take 1

* Would this work?

* remove dangling debug code

* rebase & fixes

* vv bitfield stuff, reading

* DNM oceans of shitcode DNM

* honk

* honk2

* plonk

* rebase & fix
2018-01-22 20:19:46 +01:00
oranges 9d0e97fc8d Merge pull request #32311 from kevinz000/component_forensics
MoreRobustThanYou's datum forensics but it's a component this time.
Fully refactors forensics, including fingerprints, hidden/admin fingerprints, suit/clothing/whatever fibers, and blood DNA residue to /datum/component/forensics.
Adds support for manually adding fingerprints.
🆑
code: Forensics is now a datum component.
balance: NPC humans will now start leaving fingerprints on things they touch!
/🆑
2017-12-28 10:18:11 +13:00
Emmett Gaines 4595c46dca turns the baseturf var into a part time list (#33705) 2017-12-25 20:10:08 -05:00