Commit Graph
143 Commits
Author SHA1 Message Date
LucandGitHub 9ba005de9f Add themselves as a pronoun helper, fixes some usages of it (#20184)
* Add themselves helper

* Testing and replacing

* Fixes some non-standard usages
2023-01-20 19:28:48 -05:00
warriorstar-orionandGitHub a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
363464801c Ice Cream Cone Tweaks and New Sprites redux (#19544)
* Ice Cream, reagent colour, and drink colour update

* re-add accidentally removed drink

* updates for lewcc and sean's review

* a few new names and updates for lewcc's review

* adding S34N's suggestion

* fix merge comflict

* Update code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/desserts.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* modified things as per Sirryan's review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-12-12 22:15:43 -05:00
S34NandGitHub f9a55dbbd8 Various shuttle fixes, new shuttle type (#19378)
* shuttle fixes

* bamboo

* nocreep grass

* windows
2022-11-09 23:37:19 -06:00
S34NandGitHub 667dd5d4ac 515 Compatibility (#19636)
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
2022-11-08 23:08:40 +00:00
PacifistDalekandGitHub 9aacf9fead New pumpkinhat and blumpkin hat sprites (#19429) 2022-10-20 20:35:28 +01:00
GDNandGitHub e510680a20 adds blackbox logging for revival (#19399) 2022-10-16 12:33:41 +01:00
Vi3triceandGitHub 20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
AdriandGitHub 072fc6e1d5 Fixes tower cap logs being choppable in bags (#18939) 2022-08-31 15:06:16 +01:00
SteelSlayerandGitHub 358ff86ddb Removes the need for ComponentInitialize (#18833)
* removes `ComponentInitialize`

* mapload

* add back CRASH
2022-08-18 22:00:19 +01:00
6d73208ce8 Fixes sunflowers (#18729)
* yes

* Update code/modules/hydroponics/grown/flowers.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-08-06 10:54:45 -05:00
18a440a9bb Adjusts 15 berets and 9 other pieces of headwear to properly fit vox heads, part 1 (#18221)
* Chef hat fix

* Revert "Chef hat fix"

This reverts commit 645d08afdd.

* Alphabetizes vox head icons

* Repositions, recolors, and fixes vox headwear

* Adds code so the headgears actually show up

* Adds blockhair flag to bandana

* Revert "Adds blockhair flag to bandana"

This reverts commit ca47ba5000.

* Removes bandana vox code

* Removes the bandanas, will be done in another PR

* Removed superfluous sprite sheet declarations

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/customitems/item_defines.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-16 15:24:00 -05:00
51f870595e Nerfs Deathnettle (#18128)
* Nerfs Deathnettle (I hate plants)

* Update nettle.dm

Early returns are good apparently.

* Stage of grief: fear

Should fix errors?

* Update code/modules/hydroponics/grown/nettle.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-06-30 19:00:29 +01:00
0f7a8707ef [Ready] Refactors stuns and status effects. (#17579)
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-05-24 16:35:26 +01:00
SteelSlayer b723999741 clownfish 2021-11-14 23:26:49 -06:00
PacifistDalek cf5ccab58b missed something 2021-10-14 13:10:41 -04:00
PacifistDalek 58f642fa7a content 2021-10-14 13:06:30 -04:00
AffectedArc07andGitHub 221ea814d8 Revert "Whole bunch of Hydroponics Sprite changes" 2021-10-14 08:00:32 +01:00
PacifistDalek f9849cd1f3 where the bananas are blue and their peels are slippy 2021-10-13 15:08:37 -04:00
PacifistDalek 9fb48626e8 take me down to hydroponic city 2021-10-13 13:58:14 -04:00
PacifistDalek eb9fede50b Still need to change filling colour of flowers 2021-10-12 15:48:34 -04:00
Fox McCloud b98929ac20 Removes Separated Chemicals 2021-09-15 13:14:27 -04:00
AffectedArc07andGitHub ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00:00
SabreMLandGitHub 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
AffectedArc07 7486d026b7 READY 2021-05-23 17:26:17 +01:00
PidgeyandGitHub e444ecbf97 Added Wasabi - a pungent spice found in basic nettles. (#15870) 2021-05-04 21:38:56 -04:00
fb06547f97 Various bugfixes (#15873)
* pAI Record Fix

* AI Respawnability

* Wine Reagents

* Ghost Repulsing

* Agent ID Card Numbers

* Maint Drone Lights

* Fix fixes

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Headpocket runtimes

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-04-19 14:50:30 +01:00
DennisandGitHub 13512ba21a Added mutatelist = list() to onion/red (#15858) 2021-04-09 18:05:25 +01:00
Fox McCloudandGitHub fdc6ab2211 Damns Devils Gamemode to Hell (#15672)
* Damns Devils Gamemode to Hell

* Update config.txt
2021-03-07 12:00:02 +00:00
Fox McCloudandGitHub 88c00d12c6 Nettle Pickup Fix (#15630) 2021-02-28 12:51:07 +00:00
Fox McCloudandGitHub 20485c029b Pickup and Dropped Bugfixing (#15575) 2021-02-24 19:23:31 +00:00
Fox McCloudandGitHub 02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483)
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
2021-02-21 21:25:19 +00:00
sneksnekandGitHub fdb8b94c3c Adds mint, a new plant that can be processed into menthol (#15383)
* Update medicine.dm

* Update herbals.dm

* Update vending.dm

* added mint seeds

* added mint harvest

* added mint plant

* an attempt to fix the problem

the pr is having trouble with growing.dmi for some reason, i was told to do this

* another empty line for the above reason

* wow okay, be like that then

* no empty lines since you're bickering

* lets see if you like this

* forgot the mint chem in reagents/misc.dm

daily reminder that im a smooth brain

* made it green and distill into menthol

* made it goon

* moving it to the appropriate file

* moved to food.dm since it's a consumable

* clarification of new distilling result for desc
2021-01-30 16:53:51 -05:00
PacifistDalekandGitHub 0c22bb3e7e Updating some of our food sprites to better ones from other codebases (#14694)
* Adding in new sprites for a bunch of crappy food sprites

* Adding attribution for Goon origin sprites

https://github.com/binarysudoku has relicensed the sprites requested for our use (relicensing means they don't have to go in a separate folder). I've included attribution notes on each sprite that I've taken, as per our license

* Added a bunch more sprite changes!

* forgot the holymelon

* Updating trash sprites for junk food, adding a space twinkie trash sprite
2020-10-25 00:16:13 -04:00
f312297f9d A variety of minor food related fixes and tweaks (#14656)
* Changed Milo to Miso

* Update baked_goods.dm

* typo fix

* Revert "typo fix"

This reverts commit 3f6ca6a5b9.

* Revert "Revert "typo fix""

This reverts commit b67ed80d8d.

* Update food.dm

* removing beff and pepperoni

* adding onions as juiceable

* made drying grapes give you homemade raisins since homemade raisins were already in the code

* undo the onionjuice because it crashed my test server

* replaced the vomit cheese with vomit cheese substitute, removed beff and pepperoni, made weird cheese actualy spawn a weird cheese wedge

* updated enzyme name and description to match how catalysts actually work and how the enzyme already works in game (and has for almost a decade in game)

* Moved onion rings to the deepfryer instead of microwave

* makes the fries recipe actually makes sense, and makes it benefit from the upgrades of the processor (so you can get more fries)

* made macaroni and cheese names consistent

* moved two recipes to oven from microwave

* Wine comes from grapes ya dingus

* name fix

* made burger recipes consistent except for the big bite and super big bites

* yaki imo is baked whole sweet potato, not processed!

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* made food names consistently lower case

Except of course for foods that are supposed to be brand names, like Space Twinkie or the BigBite burger

* Missed one

* Back to american mac 'n' cheese spelling

* Macaroniiiii

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-21 09:40:27 -04:00
PeakandGitHub a3bb36bf39 Omega Weed Balance Changes (#14584)
* Update cannabis.dm

* Update cannabis.dm
2020-10-14 20:54:45 -04:00
joep van der velden 0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
mochi fb9a4831db Fix replica pod cloning species with NO_SCAN 2020-09-14 11:11:31 +02:00
joep van der velden d3743f83fa Improves bomb logging and replaces single attack log msges with actual logging 2020-06-08 23:44:06 +02:00
SteelSlayer 7088de6bab slippery component 2020-06-06 15:35:12 -05:00
Deckard CainandGitHub f97bc5876b fixed apples not distilling in fermenting barrels
apples previously distilled into hcider, which was an icon state and not actually a reagent proper. this resulted in apples simply not fermenting into anything when processed in a fermenting barrel. (if the apples contained reagents such as plant_matter or sugar or whatever else botanists put in their genes, then these would of course be transferred to the barrel normally.)
2020-05-14 16:53:41 -04:00
AffectedArc07andGitHub ded391b325 Bonfire Logs (#13268)
* Bonfire Logs

* Farie Suggestion

* Adds craft logging

* Log changes
2020-04-11 15:47:45 -06:00
AffectedArc07andGitHub 210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06:00
AffectedArc07andGitHub 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
variableundefinedandGitHub edebec5194 Merge pull request #13021 from Fox-McCloud/add-cbd
Adds CBD
2020-03-08 21:46:20 -04:00
variableundefinedandGitHub 5f6e9f8cb2 Merge pull request #13007 from TheSardele/log-change
Adds a log for admins
2020-03-08 03:43:52 -04:00
Mitchs98andGitHub d04c11eb60 Le Bomba (#13052) 2020-03-01 13:18:01 -07:00
Fox McCloud c55ce4aab3 Adds CBD 2020-02-23 19:46:29 -05:00
TheSardele 7af1b2ae1e Use helpers 2020-02-20 11:42:59 +01:00
TheSardele 3635b42335 Adds a log 2020-02-19 23:58:46 +01:00