Commit Graph

371 Commits

Author SHA1 Message Date
SkyratBot
b8d9874c27 [MIRROR] Converts all A && A.B into A?.B (#1292)
* Converts A && A.B into A?.B (#54342)

Implements the ?. operator, replacing code like A && A.B with A?.B

BYOND Ref:
When reading A?.B, it's equivalent to A && A.B except that A is only evaluated once, even if it's a complex expression like a proc call.

* Converts all A && A.B into A?.B

Co-authored-by: ZeWaka <zewakagamer@gmail.com>
2020-10-13 23:19:25 +02:00
SkyratBot
621a822227 [MIRROR] Separates mothpeople antennae into a mutant bodypart (#976)
* Separates mothpeople antennae into a mutant bodypart

* we

* Update moth_wings.dmi

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-25 14:38:52 +02:00
SkyratBot
4b6cc9d088 [MIRROR] Arcane finishes the fight and adds all the missing belt sprites and a worn sprite Admin Tool. (#830)
* Arcane finishes the fight and adds all the missing belt sprites and a worn sprite Admin Tool. (#53305)

* Arcane finishes the fight and adds all the missing belt sprites and a worn sprite Admin Tool.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-09-17 02:05:30 +01:00
SkyratBot
5831d3309e [MIRROR] Adds native chilly peppers to icebox flora. (#745)
* Adds native chilly peppers to icebox flora. (#53544)

Now, icebox has a native plant that can be picked on the surface level, where the sunlight reaches highest, and rarely seen underground, and provides you chilly peppers. Traditionally a chili pepper mutation, the theme was close enough that I felt it'd be a good fit for the map, and helps break up the monotony of the map being ice, rock, and more ice with some harvest able flora.

* Adds native chilly peppers to icebox flora.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-09-11 23:15:51 +02:00
SkyratBot
3a0bbe9498 Acid Component (#53273) (#661)
Makes acid levels a component.
    Merges the acid effect object into the component.
    Reworks acids decay rates slightly.
    Rebalances xenos acid spit so that they can still melt through walls.

Misc. associated changes:

    Adds defines for a lot of the acid associated constants.
    Documents clean types and adds CLEAN_TYPE_ACID
    Adds and implements a return bitflag for COMSIG_COMPONENT_CLEAN_ACT
    Adds a looping sound for acid.
    Makes /atom/proc/acid_act return a boolean.
    Fixes waterclosets creating a new reagent holder datum every time they are used.
    Removes waterclosets regenerating reagents on-use and restricts their reaction volume to 5 units.
    Adds and implements a couple reagent signals.
    Renames a few vars so Rohesie can stop telling me to rename more vars.

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2020-09-07 03:52:59 +02:00
SkyratBot
0698a8bd61 [MIRROR] Rename orbiters list of orbiting orbiters var to something sane (#660)
* Rename orbiters.orbiters list to something sane (#53416)

* Rename orbiters list of orbiting orbiters var to something sane

Co-authored-by: Wayland-Smithy <64715958+Wayland-Smithy@users.noreply.github.com>
2020-09-06 05:56:05 +02:00
SkyratBot
3d5138261f [MIRROR] The great Spectral Blade permanent ghost trap unGBJing - 10/10 ghosts currently hate this blade (#622)
* The great Spectral Blade permanent ghost trap unGBJing - 10/10 ghosts currently hate this blade (#53324)

Fixes a bug caused by transferring an orbiter component to a parent where one already exists. Causing the old original orbiter to update the added ghosts positions when the parent moves, but not allowing them to ever break orbit and also setting the ref to null for the component on the whole due to old signals it would seem.

Also tweaks the blades use in hand ghost notification message to remove the redundant (Orbit) link.

* The great Spectral Blade permanent ghost trap unGBJing - 10/10 ghosts currently hate this blade

Co-authored-by: Wayland-Smithy <64715958+Wayland-Smithy@users.noreply.github.com>
2020-09-02 03:16:39 +02:00
SkyratBot
ec09510459 Bools and returns super-pr (#53221) (#565)
Replaces like 70-80% of 0 and such, as a side effect cleaned up a bunch of returns
Edit: Most left out ones are in mecha which should be done in mecha refactor already
Oh my look how clean it is

Co-authored-by: TiviPlus <TiviPlus>
Co-authored-by: Couls <coul422@gmail.com>

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Couls <coul422@gmail.com>
2020-08-30 05:12:59 +02:00
SkyratBot
a5306924c3 [MIRROR] Makes reagent exposure methods bitflags (#527)
* Makes reagent exposure methods bitflags (#53164)

* Makes reagent exposure methods bitflags

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2020-08-26 02:37:07 +02:00
SkyratBot
3bd294f26f [MIRROR] Defines damage flags. (Hopefully without 50+ commits) (#491)
* Defines damage flags. (#53158)

* Defines damage flags. (Hopefully without 50+ commits)

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2020-08-24 22:52:31 +02:00
SkyratBot
0b65cc596b [MIRROR] Overlay lighting component (#469)
* Overlay lighting component (#52413)

Sparks no longer lag, projectile beams move super smoothly, same with mobs and whatnot. This also allows for easy expansion into directional lights, field-of-view, wee-woo rotating lights or whatever.

It does have a downside: things right-clicked or checked through the alt+click tab will show the light overlay:


This is a BYOND limitation, very well worth it IMO.

🆑
add: Smooth movable lighting system implemented. Projectiles, sparks, thrown flashlights or moving mobs with lights should be much smoother and less laggy.
balance: Light sources no longer stack in range, though they still do in intensity.
/🆑

* Overlay lighting component

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-08-23 20:17:12 +02:00
SkyratBot
629000e5f5 [MIRROR] Completely remove the blood contract from the game, including the blood contract antag datum. (#449)
* Completely remove the blood contract from the game, including the blood contract antag datum. (#53059)

* Completely remove the blood contract from the game, including the blood contract antag datum.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-08-21 14:16:45 +01:00
SkyratBot
42da7ac369 [MIRROR] Reworks the Hierophant Club as a general utility item and removes attacks. (#409)
* Reworks the Hierophant Club as a general utility item and removes attacks. (#52880)

This PR reworks the Hierophant Club into a utility item. Mining? Gone. Attacks? Gone.

In their place? 5-tile range point-and-click instant teleport similar to the ninja. Max charge is 1. Recharge time is 15 seconds.

With the removal of this bloat, the item is now small enough to fit in the average backpack.

The hiero club establishes itself as the entry-level megafauna drop from the entry-level megafauna.

* Reworks the Hierophant Club as a general utility item and removes attacks.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-08-19 04:53:26 +02:00
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
0b5b2b16dd [MIRROR] Fixes some pacifism oversights (#260)
* Fixes some pacifism oversights (#52820)

* Fixes some pacifism oversights

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2020-08-10 23:15:20 +01:00
SkyratBot
a00c65aad6 [MIRROR] Lazylists some /mob and /living stuff (#238)
* Lazylists some /mob and /living stuff (#52750)

* lazy

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: TiviPlus <TiviPlus>
Co-authored-by: Rohesie <rohesie@gmail.com>

* Lazylists some /mob and /living stuff

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-08-07 18:44:40 +01:00
SkyratBot
1f4ee89509 [MIRROR] Contributes more missing belt, back, and otherwise ERRORing sprites. (#220)
* Contributes more missing belt, back, and otherwise ERRORing sprites. (#52670)

* I'm crying over all these beeeeeeelts

* Removes ?

* Provides some close enough substitutes for inhands

* Contributes more missing belt, back, and otherwise ERRORing sprites.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-08-07 01:38:23 +01:00
SkyratBot
284f2de8a1 [MIRROR] Cleans up some unused procs and makes is_blocked_turf a turf proc. (#136)
* Cleans up some unused procs and makes is_blocked_turf a turf proc. (#52482)

* Cleans up some unused procs and makes is_blocked_turf a turf proc.

* Update code/game/turfs/turf.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>

* Cleans up some unused procs and makes is_blocked_turf a turf proc.

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-31 00:30:27 +02:00
Ryll Ryll
a97c51b30b [READY] Wounds part 2: Piercing wounds, dismemberment changes, housekeeping (#51786)
* pierce the heavens

* starts doing projs

* continue pierce

* before armor

* before sharpness redefine

* rename sharp defines, before further implementation

* finishing undoing atk_type back to sharpness

* neatens up sharpness defines, FALSE -> SHARP_NONE

* more piercing, removes brute damage bleed, bubblegum no longer wound

* starts letting embeds get in on the fun

* half with embed

* work on dismembering

* continued embed work

* more moving bandaging to limbs

* more dismemberment work

* removing embed pierce stuff

* tweaking bullets

* more docs and work on dismemberment

* spans, piercing, guns

* dismemberment and scar fixes

* bee changes

* bullets embedding

* more bullet and dismember work

* dismemberment, surgery, piercing, formaldehyde,

* pleases travis

* pierce smite

* nicer on blood

* Auto stash before rebase of "tgstation/master"

* more neatening

* wounds only consider up to 35 damage, wounds on l6 and 762

* updates hulk

* balance

* defines

* lower slug to 50 brute to accommodate wounds

* adds differentiation for having flesh/bones/both in mobs

* moves scar descs to json, renames organic_state

* excises removed healing skill

* fixes logs, inconsistencies, some balance changes

* untab

* slight compress

* a

* kills pointed global list

* dmdoc

* halfway through roh

* finishes roh review

* okay NOW i finished roh's reviews

* roh roh roh your boat

* gently down the stream

* global lists

* list ops, fix scanner for bone gel improvised fix

* travis moment

* sounds added and moved

* pellet clouds can join the fun fully, slight gun balancing for wounds

* doc moment

* unconflicts myself

* update hulk

* Update code/_onclick/item_attack.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* crying ascii face

* final rohview

* oops

* final final

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-23 22:20:09 -04:00
ArcaneMusic
919f64d255 Alright cacti is probably the correct name. 2020-07-12 21:42:19 -04:00
ArcaneMusic
7890119d18 Ready made cactuses and cactus parts when we have <100 Prs. 2020-07-11 06:23:26 -04:00
EdgeLordExe
3b24a4fe2f Miner to cook : Miner changes continue! (#51924)
About The Pull Request

Miners can no longer get meat hook from necropolis chest, it was moved to being a cook traitor item that costs 11tc. You know it is literally called meat hook, it is thematically better as a chef weapon.
Why It's Good For The Game

Why? just why? Who the fuck would give miners a weapon that is completely useless against lavaland mobs, but is incredibly good at killing people.
Changelog

cl
balance: Meat hook is now a 11tc cook traitor item. It can no longer be aquired from necropolis chests. sorry miners!
/cl
2020-07-07 10:51:16 +12:00
TemporalOroboros
e78d82592f Refactors reagent exposure code (#51396)
* Refactors reagent exposure code

Removes istype clutter. Renames a few procs

* == TRUE

Adjusts COMPONENT_NO_EXPOSE_REAGENTS bitflag offset.

TODO: Remove comment

Co-authored-by: Rohesie <rohesie@gmail.com>

* == TRUE

Adjusts COMONENT_NO_EXPOSE REAGENTS bitflag offset.

Removes comment

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-06-21 20:03:19 -03:00
ATH1909
e265d9f545 Update ash_flora.dm (#51524) 2020-06-18 17:26:56 -03:00
ShizCalev
debba87ec2 fixes "dante torn the changeling with the sword" (#51688) 2020-06-18 15:48:12 -03:00
nemvar
b87f65d95e Converts ALL typepaths to lowercase (#51642)
* Case of lower

* More changes

* Ruins the nice 420 diff, brainfart when doing the second batch of conversions

* More changes

* Next batch. I think

* Converts even more paths

* Restarts bots

* Capital Free Zone

* Come on travis, do something

* Renames areas

* Bots, please stop dying

* Updates CONTRIBUTING.md and updates a few paths I missed.

* APC recgarftzfvas
/obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
2020-06-17 20:47:57 -03:00
IndieanaJones
8688d844c7 [READY] Lavaland Elite Buffs and QoL Changes (#51139)
* Update Every File in the Elites Folder

* Prevent Lavaland Elites from Taking Bleed Damage (Because it's stupid)

* Increase the Power of Hope from 5 to 10

* Goddamit Travis

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>

* Update to comply with autodoc requirements

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update legionnaire.dm with requested changes

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Last Fixes and a Final Change

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-06-09 00:07:35 +02:00
Fikou
76af297c4a necropolis tendril loot changes (#51044)
* necropolis chest changes, concussive gauntlets

* fixes bad things

* h

* ah yes, the "get banned" grenade as lavaland loot

* better code

* fuck

* what did he mean by this

* FUCK!!

* oops

* hamburger cheeseburger big mac whopper big mac whopper big mac whopper

* spel fix

* wh*t the heck?

* this file has all the other tendril loot so
2020-05-25 09:18:47 +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
c092f08403 Adds mothpeople potion of flight wings (#50183)
* First steps

* bugfix and color match

* Changes as requested

* h

* D

* T

* M

* Lowercase
2020-04-01 04:01:00 -03:00
Fikou
e50b7691c4 the basic, need fluff and sidesprites 2020-02-20 22:19:43 +01:00
spookydonut
6401ba5708 Merge pull request #49421 from ShizCalev/define-cleanup
Cleans up redundant math defines
2020-02-20 19:32:36 +08:00
ShizCalev
6f370508e5 Merge pull request #49342 from Fikou/custom-holopara
[READY] Adds Guardian Customization
2020-02-18 23:36:29 -05:00
ShizCalev
7209ac3c93 Removes unnessacary math defines 2020-02-17 23:09:09 -05:00
Fikou
f39c60d967 changes miners holopara to the hivelord 2020-02-17 17:11:47 +01:00
JJRcop
a1392847bd Remove ismovableatom macro (#9) 2020-02-17 15:03:16 +01: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
MrPerson
26093e5ac2 Further update_icon splitup (#48784)
* Further update_icon splitup

After this there'll be just under 100 old update_icon() calls that need fixing.

* Thanks Travis
2020-01-22 10:18:05 -05:00
JMoldy
454ad4fe44 Removes paralysis on meathook, rebalances damage (#48546)
About The Pull Request

Removes the stun on the hook to bring it in line with other weapons losing their stun. Reduces the brute damage, adds stamina damage.
Why It's Good For The Game

Paralyze as a weapon mechanic is no longer supported, this brings the hook in line with other modern stamina-damage weapons. It also brings the hook's armor penetration down to something closer to an armor piercing rifle round, rather than being an absolutely perfect armor penetrator.

cl
balance: Removes hitstun on meathook
balance: Changes meathook's damage from 25 brute at 100 armor penetration to 20 brute, 20 stamina at 60 armor penetration
balance: Changes the bounty hunter's meathook to do 40 stamina damage instead of a stun, adds a half-second knockdown.
/cl
2020-01-14 11:22:51 +13:00
Twaticus
b098edd11a nae nae attempt 3 (#48656)
Inhand sprites for whips
2020-01-09 05:49:52 -08:00
skoglol
93f1f4ebde blood contract no longer works on CC level 2019-12-31 07:27:31 +01:00
skoglol
4a487ca803 Refactors language holder (#48106)
* Language holder refactor

* Ironed out bugs, testing

* adds sourced language, blocking list. more useful helpers.

* Replaced old usage

* Adresses requests

* Autodoc attempt #1

* Fixed monkeyize (again)

* Travis happy

* Language menu updated

* Final pass
2019-12-18 22:22:12 +01:00
spookydonut
f3a99558c3 Removes some dead/unused code (#48158)
* cleans up some deadcode

* ancient

* goon icons

* rice and garlic

* more

* last one

* fuuuuuuuuuuuuuuuuuucking subtypes
2019-12-15 14:09:02 -05:00
skoglol
4f24cfaa7d Fixes more input sort runtimes (#47957)
* Fixes another sorting runtiming.

* sortNames copy list, another wrong sort.
2019-11-28 19:38:57 +01:00
Emmett Gaines
5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
Urumasi
90d184ab98 Waterbottle fix (#47292)
* Fix waterbottles made out of glass, remove relic bottle from necropolis chests

* bye bye mats

* hello? mats?
2019-10-23 21:01:37 +02:00
skoglol
938e66f62c Adds sorting to most input() lists (#47117)
* Adds sorting to most input() lists.

* Sorted some global lists, added more input sorting

* Should now use correct sort everywhere.

* compiles

* Last fixes.
2019-10-22 04:28:42 -07:00
kingofkosmos
52325eda25 Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/structures/beds_chairs/chair.dm
#	code/game/objects/structures/lavaland/geyser.dm
#	code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
#	code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
#	code/modules/paperwork/contract.dm
2019-10-17 06:02:06 +03:00
zxaber
461c6b0351 Have you tried taking the necklace off and putting it back on? (#47035) 2019-10-15 10:57:29 +02:00