Commit Graph

1601 Commits

Author SHA1 Message Date
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
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
spessman-007
ab84042f94 [READY] Improve spelling (#51134)
* Improve spelling

* Spell isn't, ain't, shouldn't, hasn't, wasn't correctly

Co-authored-by: NewSta <spessman-007@users.noreply.github.com>
2020-05-25 02:13:37 +08:00
Rob Bailey
31c6862585 you can now uniquely rename the kinetic crusher (#50852) 2020-05-05 17:28:59 -07:00
nemvar
a6bbf09898 Fixes ORM scooping bugs. (#50809) 2020-05-05 17:26:32 -07:00
William Wallace
b9b3cffad7 removing some duplicated proc definitions (#50812)
* remove duplicate definition of '/datum/component/plumbing/reaction_chamber/can_give'

* remove duplicate proc definitions for '/datum/status_effect/pacify/'

* syndicate holster correctly sets storage component's silent var

* singularity_act no longer deletes fulton 'extraction holder'

* singularity_act no longer deletes rend tears

* remove duplicate singularity_pull method from /obj/effect/cult_turf/overlay

* remove no longer used 'dir_map_to_angle' proc from reflectors

* remove duplicate /mob/living/simple_animal/bot/hygienebot/Crossed
2020-05-06 02:36:14 +08:00
Fikou
3a8c0de7ed you can now uniquely rename the kinetic crusher 2020-05-03 23:26:45 +02:00
uomo
7a31f65220 Some more fixes for signs and related stuff. (#50752)
* inhand icons

* Adding to the object, forgot to name one icon.

* Fixing some stuff, and creating inhand icons.

* Fixes a thing I broke.

* Fixes things (including ALL posters) that shouldn't be wrenchable being wrenchable. Plaques now transfer icon_state always.

* Picture frames, painting frames, and the monkey portrait are now wooden.

* Fountain pens can now be uncommonly found in maint.

* Uneditable sign types should not become editable when unwrenched.

* Move redefined var above newly defined var.
2020-05-01 21:52:36 -03:00
Fikou
4230492e77 adds the improvised pickaxe (#50534) 2020-04-23 18:47:48 -03:00
spookydonut
2b66dfbc61 Fixes "thats" in a few item descriptions. (#50520)
* Fixes "thats".

* /obj/item/pickaxe/rusted

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-04-24 01:16:56 +08:00
spookydonut
e573878ff3 /obj/item/pickaxe/rusted 2020-04-24 01:07:40 +08:00
ArcaneMusic
9d1ecb188d Fixes merge conflict 2020-04-21 21:09:56 -04:00
ArcaneMusic
b20683b1e0 Merge remote-tracking branch 'upstream/master' into cashlogging 2020-04-21 21:02:38 -04:00
ArcaneMusic
0e2dfb6cc3 I think this is the thing for public logging? 2020-04-21 20:28:38 -04:00
ArcaneMusic
ddee742ad9 Basic econ logging 2020-04-21 17:37:15 -04:00
Aleksej Komarov
5f621c750d Finalize the rework 2020-04-19 19:38:53 +03:00
actioninja
b5dfd8880d id to component name 2020-04-19 19:36:35 +03: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
SteelSlayer
b391baeb74 Republish - Machinery processing refactor (#49307)
* initial

small thing

* improvements

1. Removes loops for picking up items. its now an item by item basis unless there is an ore box involved
2. Removed pickup_rate and ore_buffer var for the ORM, they aren't needed anymore
3. Fixed conveyors not moving items that get created on top of them (New / Initialize), by sending signals when atoms are created.

* renames the registered signal proc name so travis doesn't throw a fit

* signal improvement

* forgot to update other proc names

* ninjanomnom review changes

replace NEVER_PROCESS with START_PROCESSING_MANUALLY

default_unfasten_wrench override for ORM

50 -> 5 SECONDS

I totally didn't mispell anything

* makes a new signal: COMSIG_ATOM_CREATED

* more review changes

* duh

* even more review improvements

* switch >= to >

* reverts conveyors back to using process() for moving stuff

* various touch ups, adds documentation

* rebase to fix map conflicts with forgottenship.dmm

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-03-31 01:52:25 -03:00
Fikou
bac5fd01a5 adds bubblegum gum (#50026)
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* adds bubblegum gum

* autodoc

* fixes fuckups

* fixes merge conflict and bad things

* nicer color

* shortens proc name

* Update code/modules/food_and_drinks/food/snacks_other.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* cringe

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-23 14:04:26 -03:00
Rohesie
d74c0bfba1 Merge pull request #50012 from kingofkosmos/time_tenses_to_present
Verb time tenses to present tense
2020-03-19 16:19:49 -03:00
TiviPlus
8e2ac283ed Small grammar stuff (#50016) 2020-03-17 12:23:40 -04:00
kingofkosmos
79c5a80ca0 Visible_messages verb time tenses changed to present. 2020-03-16 14:55:25 +02:00
Fikou
229bf6f63a Merge branch 'master' of https://github.com/tgstation/tgstation into guardianfixes 2020-03-05 14:15:01 +01:00
spookydonut
319ca52545 removing unnecesary double parent proc calls (#49694)
* removing unnecesary double parent proc calls

* i made an oopsie
2020-03-05 18:51:37 +08:00
nightred
15452cac44 [READY] Two Handed Component (#49422)
About The Pull Request

For an item to be two handed just add this handy component.

All existing two handed items have been converted to use this component.
Why It's Good For The Game

It has components and signals, and now you can make items two handed so simply.

/obj/item/shockpaddles/ComponentInitialize()
	. = ..()
	AddComponent(/datum/component/two_handed)
2020-03-04 11:26:01 +13:00
fluffe9911
5eea39977d [READY TO BE MERGED] King Goat Achievements, bugfixes, and minor tweaks (#49159)
* king goat memes

* I cant grammar

* newline

* the arena is no longer pressurised

* How into grammar

* I am embarrassed I did not notice this

* no hotel vacations in the arena

* better goat hoof sprite curticy of stephen

* new goat gun sprite

* might as well

* grammar

* no more king goat plushies in toy crates

* Update code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm

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

* done

* based and redpilled

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-02-24 20:47:42 -05:00
ShizCalev
4316f79d32 Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
typo fixes, inconsistencies with Nanotrasen capitalization, ect
2020-02-22 22:35:53 +13: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
Fikou
ebad3a9041 cockroach refactor (#48836)
About The Pull Request

cockroaches are now a hostile mob and glockroaches are a child
also glockroaches dont 1 shot tables and stuff anymore
Why It's Good For The Game

copypaste BAD??
Changelog

🆑
refactor: glockroach
/🆑
2020-02-17 21:24:00 +13:00
Emmett Gaines
9e34b3d6a1 Supports named arguments in AddComponent and AddElement (#49098)
AddComponent/AddElement now support named arguments. This requires passing around an argument list instead of using actual proc args which a bit gross but we can blame byond for forcing this.

InheritComponent uses mirrored init arguments instead of an argument list which means no more accessing it via index to get to the same arguments as in init.

As a small bonus I restructured dcs defines to be a bit more manageable. Mainly just splits them into separate files and gives them their own folder.
2020-02-17 17:57:52 +13:00
Buggy123
800457ffc8 Random mineral spawns change less turfs. (#49205)
As-is, random mineral spawning changes the turf to the subtype with that mineral, which results in a lot of turf changes I guess. Now it just changes the mineralType of the turf. Unless it's gibtonite or a cave spawner, because the alternatives are worse and those aren't all that common anyway.

🆑
tweak: Random mineral turfs no longer cause large amounts of turf changes on initialization.
/🆑
2020-02-15 13:34:15 +13:00
nightred
395bebcdcc [READY] Space Suits use cells and warm the wearer (#49028)
About The Pull Request

This makes space suits use a cell and warm the wearer, This was handled by the handle_environment proc in the past with an override to make the suits work. This corrects this issue, and removes the override.

All space suits will have a cell installed at round start, this cell will last 15 min on average usage.

The cell cover can be toggled by alt+clicking (press the button), or using a crowbar (just pry it open) on the suit.
With the cover open you can remove the cell by using the suit in hand, or ctrl+clicking the suit.
As well with the cover open you can use a screwdriver to set the thermal regulator's temperature. The normal range is 20 c to 45 c, do not use an emag on the suit to increase the temperature range.

Examining the suit will report the temperature setting and the cells charge, if the cover is open you will also be able to see the type of cell that is in the suit.

Suit storage units will now charge the cells in suits, they will also require power to operate properly now.

Why It's Good For The Game

    Space suits should be managing the wearers temp in space not using some override.
    Lizards now have a portable heater in the form of any space suit.
    Now that suits need a cell it is not as easy to spend all session in a space suit.
    New interactions with hardsuits and emp's give nice combat buff to an underused item.
    Nuke ops can raid xeno for some nice yellow cells, or science for a big old bluespace cell.
2020-02-15 11:32:54 +13:00
Arkatos1
cd2a685ee8 tgui-next: Mining Vendor (#48991)
* Mining Vendor tgui-next

* Formatting

* Revert "Formatting"

This reverts commit 2eb35516b2f755d78341915a4b57b2b8548195eb.
2020-02-07 16:59:10 +01:00
Jordan Brown
ce9577663a Merge pull request #49173 from ninjanomnom/material-lazy-init
Makes the global materials lookup lazily initialized
2020-02-04 11:05:59 -05:00
Qustinnus
48de09b7a4 Edible component; be gone vile organ code (#48596)
* component

* progress

* stuff

* Makes minor progress on edible component

* Finishes component and applies it to organs

* newline

* forgot to send signal

* domob addition

* wave that organ flag

* return adde

* fixes some minor issues

* fixes

* done

* done

* done

* added last one

* done

* done

* fix
2020-02-04 01:05:55 -05:00
Emmett Gaines
ab3a127295 Makes the global materials lookup lazily initialized 2020-02-03 10:17:13 -05: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
vuonojenmustaturska
40657c9ccd removes a bunch of unused/bad helpers (#48969)
* a commit

* Update code/controllers/subsystem/persistence.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/__HELPERS/text.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update advance.dm

* Update security_officer.dm

* Update text.dm

* Update unsorted.dm

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2020-01-28 16:22:20 +01:00
AnturK
b2fc68db32 Fix ore silo runtime (#48976)
Unicode change revealed another material nonsense, who'd expect that.
2020-01-25 15:56:15 -08:00
Rohesie
7bef84f009 Mass-replacement of stat to machine_stat (#48758)
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
2020-01-24 12:37:17 +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
MrPerson
f7eb2c905b Unicode awareness Part 2 -- copytext() (#48512)
* Unicode support Part 2 -- copytext()

This is the transition of all copytext() calls to be unicode aware and also some nearby calls in the same functions. Most things are just replacing copytext() with copytext_char() as a terrible character limiter but a few others were slightly more involved.

I replaced a ton of
````
var/something = sanitize(input())
something = copytext(something, 1, MAX_MESSAGE_LEN)
````

with a single stripped_input() call. stripped_input() already calls html_encode(), trim(), and some other sanitization so there shouldn't be any major issues there.

This is still VERY rough btw; DNA is a mess, the status displays are complete ass, there's a copytext() in code\datums\shuttles.dm that I'm not sure what to do with, and I didn't touch anything in the tools folder. I haven't tested this much at all yet, I only got it to compile earlier this morning. There's also likely to be weird bugs until I get around to fixing length(), findtext(), and the rest of the string procs.

* Makes the code functional

* Assume color hex strings are always # followed by ascii.
Properly encodes and decodes the stuff in mob_helpers.dm which fixes some issues there.

* Removes ninjaspeak since it's unused
2020-01-18 13:07:22 +13:00
nemvar
58ec03d9a9 Fixes mining vendor edge case (#48780)
* Fixes mining vendor edge case

* I swear, everyone starts acting like an idiot if they have to write a Topic proc.
2020-01-14 20:51:34 -05:00