Commit Graph

41 Commits

Author SHA1 Message Date
Qustinnus 41157f5d6b Moves grown food to newfood (#55040)
Moves grown food to newfood
Gives trash element support for callbacks for item creation override
2020-11-23 14:00:23 -08:00
Qustinnus b713fa1bc3 moves misc food to newfood code (#54788)
misc food is now using newfood code
2020-11-18 12:20:47 -08:00
Nicolas Nattis 0e3400fd40 Komponemts 2020-10-01 20:37:57 -03:00
Nicolas Nattis 118349e362 Merge branch 'master' of https://github.com/tgstation/tgstation into tank-frames 2020-09-30 12:34:32 -03:00
Qustinnus eca964db35 Ports soup, snacks, icecream, salads and meat to newfood (#54028)
Ports soup, snacks, icecream, salads and meat to newfood
2020-09-29 20:36:27 -07:00
Nicolas Nattis c53841c1df Adds the tank holder 2020-09-28 15:04:55 -03:00
LemonInTheDark d60ed7d9e8 Gives the Chef a Beacon to pick their ingredient box (#53146)
* adds ingredients beacon

* starts the chef off with an ingredient beacon instead of a box

* Update boxes.dm

* Revert "Update boxes.dm"

This reverts commit b89fadab04.

* optimizes the list thingy (thank you, Floyd)

* Fixes a typo in one of the comments

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* fixes a definition

* moves ingredient box/beacon code to miscellaneous instead of boxes

* adds the random option

* adds a cute little bit of 'flavor' text... get it?

* Revert "adds a cute little bit of 'flavor' text... get it?"

This reverts commit a6541bf220.

* adds references to a new company and a bit of fun text

* moves randomFood out of the for loop

* Revert "moves randomFood out of the for loop"

This reverts commit e2c5171fce.

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2020-09-05 16:09:23 -07:00
Radacitus 7139d3a25e Revert "moves randomFood out of the for loop"
This reverts commit e2c5171fce.
2020-09-02 16:22:19 -03:00
Radacitus e2c5171fce moves randomFood out of the for loop 2020-09-02 12:35:34 -03:00
OnlineGirlfriend c838ba21da [Ready] Wedding Content! Crate with tuxedo, wedding dress, cummerbund, veil, and craftable bouquets (#52733)
Adds wedding content.
2020-08-26 15:01:16 +02:00
Radacitus 84aec513e4 adds references to a new company and a bit of fun text 2020-08-24 16:51:26 -03:00
Radacitus 36c68d92dd Revert "adds a cute little bit of 'flavor' text... get it?"
This reverts commit a6541bf220.
2020-08-24 04:54:00 -03:00
Radacitus a6541bf220 adds a cute little bit of 'flavor' text... get it? 2020-08-24 04:48:16 -03:00
Radacitus fe7b11c15f adds the random option 2020-08-24 04:40:24 -03:00
Radacitus f231ef2e93 moves ingredient box/beacon code to miscellaneous instead of boxes 2020-08-24 02:11:29 -03:00
kingofkosmos 3263decaad Personalized combat messages part 2 (#52890)
Adds more "personalized" combat messages for all participants in a fight: the attacker, the victim and the spectators
2020-08-13 11:34:57 -03:00
MrDoomBringer 719d3a1f45 first pass
WIP overlays


icon upd8


more


need to figure out whats going on with extractionpods


compile


the icon update


more!!


why are skillcapes broken


boat lmao


seethrough fix


Second drive-by


Code cleanup and improvements

Specifically surrounding contractor pods and reverse mode working properly
accidently left in an extra dmi whups


do the impossible see the invisible


new effect booster pack


MFW MRW Linter fail
2020-07-06 23:44:02 -04:00
ShizCalev 4a0b55ea53 Standarizes how paper products are burned (#51863)
* Standarizes how paper products are burned

* built in handling.

* clumsiness bypass param

* cleanup unneeded param
2020-06-30 21:20:09 +08: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
ShizCalev c164d9922f Fixes a few duplicate articles in examines (#51631)
* Fixes heavily fried foods naming issues

* a few more
2020-06-15 15:10:35 -04: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
Mickyan 7c7d037792 adds curator bundle descriptions (#50644) 2020-04-26 01:34:50 -03:00
Mickyan aee54c56c5 Adds space carp taming and a new bundle for the curator: the carp hunter (#50020)
* fish friends

* fish pals

* fish pals

* dumb

* hunting knife now is useful

* hunting knife now has a sprite

* FUCK

* inhand

* rohesie reviews

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-03-21 21:11:11 -03: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
moo 854c10408f Fixes Mafia Name Inputs (#49401)
* Update miscellaneous.dm

* silly me

* webedit 2, bad name boogaloo
2020-02-17 20:59:07 +01:00
Krysonism eb8b752e58 [READY]Da mafia update. Mob nicknames, new fedoras, suits! (#49029)
* base

* adjust suits

* Beige suit + fedora

* madonna

* fixes bug

* virgin mary

* Improvements

* Linter

* Removes duplicate sprite

* readds my fedora sprites.

* Gets woke(no sleep)

* linter

* readds my missing hats

* Call your parents

* resolves conflict yet again.

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-02-14 13:10:17 -05:00
skoglol 98de223135 Adds basic cybernetic organs, rebalances existing (#48714)
* Adds basic cybernetic organs, rebalances existing

* Adds severity to the emp calculation

* reduced maxhealth drasticly

* Apply suggestions from code review

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

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-01-18 19:35:03 -05: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 56b8461580 Fixes. 2019-10-19 22:17:50 +03: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
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
Rob Bailey 6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
Qustinnus fc2966ff01 [READY] Execute Protocol Crab-17: Phase 3 - The one where Floyd actually finishes the PR (#43338)
* protocol crab 17: phase 2

* k

* meme

* fix

* k

* fixes

* more stuff

* makes qust's code not bad

* fixes time

* MFW (my face when) face when floyd doesnt make the fix commit

* makes it leave properly

* fixes more shit

* gets rid of stupid variable

* asdf

* wa la

* wa la ^2

* tadaa

* adds

* i fixed some of them but what do the others mean

* untested and ready to merge
2019-05-05 19:40:46 -04:00
tralezab 0a51e7e1b9 [PROBABLY READY? REVIEW WITH SCRUTINY] New event: Fugitives (#42554)
* fugitives

* lets make this a bit cleaner

* cultists and the beginnings of security detail, lots of wip

* wip security

* WALDO (and some more work on yalp, of course)

* adding antagonist teams for both hunter and fugitives, roundend report beginnings

* this whole file is shit, but hopefully a little better

* it compiles (+ space police)

* some more work

* S.E.L.F. fluff

* grammar and icon fixes

* lets finish yalp elor, give it the justice it deserves

* moves hunter spawns to ship pods + russians P1

* moves hunter spawns to ship pods + russians P2

* fugitives and hunters now recognize eachother

* hunter spawning finished(?)

* missed this

* ATH's review

* runtime fixed, added yalp's transport ability

* anturk's review

* makes hunter.dm better trust me

* oopsies

* INVOKE_ASYNC

* russian ship + finally a (bad) sprite for the capture machine

* step > pixel, thanks travis

* mooshroom review p1

* mooshroom review p2

* improper use of /improper

* waldo's radio doesn't stick, police id

* candidate picking is more flexible + minor things
2019-03-06 10:17:46 -05:00
coiax d8dc319b4d Choice beacon explosion changes (#41998)
* Choice beacon explosion changes

🆑 coiax
del: Choice beacons (such as the one the curator, chaplain and people
with the Musican trait have access to) will no longer have pods that
have minor explosive effects.
add: Emagging a choice beacon will cause the pod to be supplied by the
Syndicate, providing the same items, but with a highly explosive
landing.
/🆑

Choice beacons are supposed to be just methods of spawning in a choice
of items, rather than weapons. I've seen traitors use the choice beacon
as a free way of instantly detonating a syndicate bomb they just
deployed, which is cute, but is probably just too powerful for a free
item.

The mild fire/knockback explosion from a choice beacon currently is
enough to set people on fire, burn up items, and throw items around in
your workplace. The focus should be on the items you get, not on the
destructive effects of their delivery.

* Removes emagging
2018-12-23 16:05:48 +11:00
81Denton 3ee98bfc72 Rebalances emergency oxygen tank availability (#41683)
* Rebalances emergency oxygen tank availability

* Reverts pirate outfit change
2018-11-28 22:45:15 -05:00
moo c07f2a65da Streamlines beacon types (#41192)
* Streamlines beacons

* Adds a comment on how to use this.

* When the item spawns in the angels now sing

* haha it's a webedit guys!

* Let Centcomm know!

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

* musicly fans rejoice

Co-Authored-By: ExcessiveUseOfCobblestone <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2018-11-01 07:52:43 -04:00
FantasticFwoosh 9a9a9f4506 Historic Heroes Unite!: Adds the historic beacon curator sets. (#40845)
* Adds the hero beacon

A Curator item with three preset uniforms availible to choose from.

* Changes curadrobe inventory content

Adds 'library supplies' of glasses & pens & removes the explorer gear.

* Replaces the curator's whip with a beacon

Its within the hero pack now.

* Creates the curators claymore

A ceremonial scottish sword for a hero pack.

* Pushes a line back into place

He who commiteth PR without fault, cast the first stone.

* Adjusts to one hero per beacon

Too many heroes may upset the time continuum.

* resolves merge conflict

I am thoroughly anti skub after this, conflict resolution for #40845

* Adds periods.

No timetravel pun intended, bad grammar is a crime. Period.

* Corrects advert typo

* Relocates skub

Pushes down the list to be with its relevant code split apart by the hero beacon rather than disjointed.

* cleans up code & spacing

Removes redundant code & spacing

* Cuts away more redundant code

Adds args to canUseTopic & removed !in_range
2018-10-15 21:39:48 -04:00
Suicidalpickles e4e1699c56 Adds Skub Suicide (#40736)
* Adds Skub Suicide

title
another dumb meme suicide

* Update miscellaneous.dm

* Update miscellaneous.dm
2018-10-07 06:50:28 -04:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00