Commit Graph
392 Commits
Author SHA1 Message Date
nemvarandGitHub 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
ArcaneDefenceandGitHub 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
spookydonutandGitHub 6401ba5708 Merge pull request #49421 from ShizCalev/define-cleanup
Cleans up redundant math defines
2020-02-20 19:32:36 +08:00
ShizCalevandGitHub 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
JJRcopandAnturK a1392847bd Remove ismovableatom macro (#9) 2020-02-17 15:03:16 +01:00
fluffe9911andGitHub 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
MrPersonandEmmett Gaines 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
JMoldyandoranges 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
TwaticusandRob Bailey 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
skoglolandAnturK 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
spookydonutandJordan Brown 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
skoglolandAnturK 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 GainesandRob Bailey 5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
UrumasiandAnturK 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
skoglolandRob Bailey 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
zxaberand81Denton 461c6b0351 Have you tried taking the necklace off and putting it back on? (#47035) 2019-10-15 10:57:29 +02:00
KomradeSpectreand81Denton 9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
kingofkosmos 280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03:00
Urumasiandmoo 6e7801550b Moves reagent fill code and adds caps to plastic water bottles (#46878)
* Adds caps to plastic bottles

* Non-crafted water bottles now spawned closed

* Added warning message for closed bottles, fixed minor bug

* meme

* Makes the warning only show up when doing valid actions with the bottle

* Clumsy people now have a chance to lose the cap

* Fix small bottle's cap when fallen over, bottles now turn upright when opened on the floor

* Add a minor positive moodlet on bottle flip

* Adds a relic lavaland water bottle that always lands upright

* Moves container fill overlay to reagent_containers, changes glass/beaker/waterbottle to glass/waterbottle

* Make actions with closed cap early return

* Minor code cleanup
2019-10-09 12:05:52 -04:00
nemvarandmoo a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692)
* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives
2019-10-06 13:37:24 -04:00
nemvarandRob Bailey dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07:00
Rob Baileyandoranges 2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
tralezabandRob Bailey aaca9360b8 [READY] LIZARD WINGS for the flight potion, flight potion no longer makes you new species (#46037)
* HEY RACISM GOT A SPRITE ACCESSORY FOR YA

* angel + dragonborn > givespeciesflight

* more review stuff

* last of the review stuff

* compile

* readds my fix

* Boolean numero uno

* Boolean numero dos
2019-08-24 00:11:25 -07:00
orangesandGitHub 57266c7d35 Merge pull request #45701 from Dennok/ChangeTurf-calls-add-keep-air
Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls.
2019-08-21 11:23:11 +12:00
Dawson1917andAnturK 5ffefaeacd Fixes spelling errors in the Berserker hardsuit (#45933) 2019-08-16 21:08:48 +02:00
81DentonandRob Bailey 7b8579c17a Minor ghost notify changes (#45759) 2019-08-08 01:47:04 -07:00
Dennok d464a7c689 add flag CHANGETURF_INHERIT_AIR 2019-08-04 12:54:12 +03:00
QustinnusandEmmett Gaines 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
tralezabandAnturK 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
py01andRob Bailey cb03a28a4b Stacking Status Effects (#44964)
* magic numbers in saw_bleed moved to class definition

* more saw bleed abstraction

refactors p2

various stacking effect refactors

saw bleed refactors again

moves stacking status class to status_effect.dm

misc stacking changes and documentation

reverts saw_bleed functionality to original

better var names, var name fix

removes extra proc

more sane handling of application

removes unused define

changes saw bleed back to original form

* another proc that can be ovverriden for falling stacks

* fixes path

* simpifies some checks

* feedback fixes

* spelling
2019-07-13 03:03:38 -07:00
ShizCalevandGitHub 6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
nemvarandTad Hardesty b83eca4647 Fix sharpness-related issues (#44830)
Turned off energy weapons can no longer cut down trees, destroy wooden
walls, harvest lavaland plants and make planks.
2019-06-27 21:19:33 -07:00
vuonojenmustaturskaandAnturK a61b86a052 fixes2 (#44736) 2019-06-27 14:13:19 +02:00
kingofkosmos ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03:00
vuonojenmustaturskaandAnturK 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
nemvarandAnturK 5917316550 Fixes lavaland flora. (#44558)
* welp

* h

* fixes lavaland flora
2019-06-18 21:19:52 +02:00
vuonojenmustaturskaandoranges 6a106bc877 Remove reagent ids and use typepaths where applicable (#44166)
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
2019-05-31 21:57:26 +12:00
Ghomandoranges 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
4dplannerandAnturK 0a22411c23 Colossus chest ignores colossus bolts (#44050)
* Colossus chest ignores colossus bolts

* Changes to pierce
2019-05-23 12:29:50 +02:00
vuonojenmustaturskaandEmmett Gaines fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
TlaltecuhtliandTad Hardesty 15357e6288 Fix grammar error in void magnet (#43426) 2019-03-31 22:09:08 -07:00
4dplanner 2e1d7bcb88 Standardises hierophant cardinal damage 2019-02-20 13:07:27 +00:00
coiaxandJordan Brown 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
Jack Edge 18376b12b1 Fixes mobs being left in inconsistent state with the Void mutation
🆑 coiax
fix: Humans with the Void mutation will no longer be able to enter the void
while inside something else (eg. cloning pod, cryotube) willingly or unwillingly.
/🆑

- I refactored immortality talisman effects to stop all this ugly ass code
reusing, and stop the weird modification of the speech invocation.
- I added DNA injectors for the Void mutation for testing.
2019-01-01 23:27:57 +00:00
81Dentonandmoo 3e8da58c0e Improves saw cleaver desc (#42112) 2018-12-29 22:53:26 -05:00