Commit Graph

351 Commits

Author SHA1 Message Date
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
KomradeSpectre
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
Urumasi
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
nemvar
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
nemvar
dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07:00
Rob Bailey
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
tralezab
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
oranges
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
Dawson1917
5ffefaeacd Fixes spelling errors in the Berserker hardsuit (#45933) 2019-08-16 21:08:48 +02:00
81Denton
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
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
py01
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
ShizCalev
6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
nemvar
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
vuonojenmustaturska
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
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
nemvar
5917316550 Fixes lavaland flora. (#44558)
* welp

* h

* fixes lavaland flora
2019-06-18 21:19:52 +02:00