Commit Graph

9296 Commits

Author SHA1 Message Date
Pirouette
816e3e5313 Dionae general lore pass (#17684)
* Dionae general lore pass

Accents, backgrounds, and gender

* Create dionapass.yml

* Update background.dm
2023-11-02 11:02:28 +00:00
Fluffy
255ebc44ee sdfasdf (#17656) 2023-10-26 17:41:27 +00:00
Matt Atlas
57a31355e7 Fixes borers being able to give people Limitless psi rank. (#17659)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-23 21:42:49 +00:00
Cody Brittain
4e2b58f02a Added new drugs from lore and otherwise (#16773)
* Initial commit of new drugs

Start on caromeg and oracle

Further work on caromeg

Fix nicotine and caromeg

Begin populating map

Designer cocaine effects

Weaken heroin, Joy now causes genetic damage

Added an artificial alternative to morphine, tramarine, that can be used in its place.

Nerf new opioids, fix tramaline recipe

Added special mentholated adhomian cigarettes, for NKA cigarettes

General fixes

Fix recipe pathing

Add coca leaves, cocaine recipes, and coca drinks

Update Chemistry-Reagents-Medicine.dm

Null name for abstract drug class

Remove abstract_class from reagents (shouldn't be used there)

* Oracle sprites by Wezzy

* .

* Begin resolving issues from code review

* Remove all per-player data from drug singletons

* Resolve Arrow's code review

* Apply suggestions from code review

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

Update code/modules/hydroponics/seed_datums/smokables.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Removed coca plants from the standard garden and hydroponics vendors (they remain as contraband and in the xenobotany garden)

* Fix merge conflict errors caused by snack PR

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-20 17:55:13 +00:00
Geeves
ebf0f3458f Mecha Gamemode: Jockeys (#17148) 2023-10-18 16:49:44 +02:00
Fluffy
f966e50ce1 Zombies upgrade (#17366)
* step 0

* sdad

* asdfsad

* safsad

* actual sprites for the bull from whitewolftamer

* Apply suggestions from code review

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update html/changelogs/fluffyghost-zombieupgrade.yml

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* sisyphus

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-10-17 21:05:27 +00:00
Geeves
b0b0c498d3 Head Layer / Bodymarkings Fix (#17616) 2023-10-16 19:30:16 +00:00
Wowzewow (Wezzy)
a88778e6aa No More Industrial IPC Security (#17403)
* No More Industrial IPC Security

* except warden

* nevermind

* Update code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* xion as well

* Update security.dm

Co-authored-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>

* Update wezzy_no_more_industrials.yml

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
Co-authored-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
2023-10-15 15:11:15 +00:00
RustingWithYou
f987cb557c Konyang: Jeweler Cockatoo & Nest (#17574)
* jeweler cockatoo nest

* ruin can actually spawn

* changelog
2023-10-14 11:13:25 +00:00
Matt Atlas
54dc8a0860 Adds TGUI say and TGUI input. (#17471)
* i alone am the honoured one

* THROUGHOUT HEAVEN AND EARTH I ALONE AM THE HONOURED ONE

* hollow point

* nanana

* ssss

* tgsay final touches

* stuff

* tgui inputs

* help

* carpal tunnel syndrome

* ffff

* again and again and again and again

* hehehehe

* dsada

* readd sanitize

* whoops

* dsad

* nah fuck that

* sd

* fix

* ow

* remove prefs for testmerging

* oops

* oops 2

* fix that

* f

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-11 23:26:59 +02:00
Alberyk
edc0a3dc28 Tajara can now select pronouns (#17538)
* Adds pronouns

* Fix
2023-10-10 12:51:25 +00:00
Pirouette
524bc827da Ports Unathi hairstyles + tails, removes human hair (#17527)
* Ports Unathi hairstyles + tails

Sources: https://github.com/VOREStation/VOREStation/pull/14614 https://github.com/PolarisSS13/Polaris/pull/8754 https://github.com/PolarisSS13/Polaris/pull/9170

* reinstates the mohawk
2023-10-08 08:59:00 +00:00
Wowzewow (Wezzy)
ea1101ec5c Better Bodyscanners and Surgery Stuff (#17520)
* Better Bodyscanners and Surgery Stuff

* ope

* i can't believe that worked

* adv

* bodyscanner fixes
2023-10-07 21:36:13 +00:00
Fluffy
878bba505e MMI QDEL brain (#17512)
* Atomization

* sdafasfd

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-06 09:21:50 +00:00
Fluffy
251f089e0c Hostile mobs runtime fix (#17513)
* Atomization

* sadf

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-06 09:21:15 +00:00
Matt Atlas
0a3531b09e Cult buffs. (#17373)
* Cult buffs.

* Update code/game/gamemodes/cult/structures/altar.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-10-05 19:20:49 +00:00
Pirouette
7d8f807eb1 Xenobiology serum sprite fixes/changes (#17529)
* xenobiology serum sprite fixes

* sets item_state

* the contained_spritening
2023-10-05 10:40:05 +00:00
Fluffy
4538e2a7cc Fix indentations (#17481)
* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
2023-10-05 10:15:58 +00:00
feartheblackout
032853824d Adds smaller variants of the Vaurca Mecha Eyes; allows for color customization (#17479)
* adds normal-sized mecha eyes + removes rogue pixels

* changelog

* Implements Roostercat's suggestion

* langechog update

* darkens the eyes a bit
2023-10-05 10:15:36 +00:00
RustingWithYou
3fa84ba88a god gives his tiniest fixes to his shittiest coders (#17494) 2023-10-01 14:24:51 +00:00
Matt Atlas
baeb7c6afd Updates subsystem definitions to new standards. (#17470)
* My heart is dragging me down into...

...oblivion!

* drifting closer to the edge but she won't have me

* ever round me we are dead before we meet her

* for the last time

* wake up in sweat

* n

* fff

* uff

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-01 14:24:40 +00:00
RustingWithYou
13143618b4 hivenet broadcasting fix (#17469) 2023-09-29 18:48:17 +00:00
Wowzewow (Wezzy)
9c69a6e884 Sprite and Bug Fixes Again Again (#17477)
* Sprite and Bug Fixes Again Again

Fixes #17465
Fixes #17462
Fixes #17456
Fixes #17450
Fixes #17458
Fixes #17422

* changelog
2023-09-29 14:01:43 +00:00
RustingWithYou
92d662ac37 Hivenet Admin Fix (#17468)
* fixes available_vaurca

* changelog
2023-09-28 00:28:06 +00:00
Cody Brittain
0a3dac31e0 Refactored do_after to use a flag-based system for options (#17127)
* Refactored do_after to use a flag-based system for options

* More flags

* Ditto

* Use the HAS_FLAG macro

* do_after pass

* Fix burning paper code

* Resolve issues from Fluffy's code reviews

* .
2023-09-27 12:17:14 +00:00
RustingWithYou
483b9a47b8 this is why we test (#17466) 2023-09-27 12:07:41 +00:00
Fluffy
870f97c1c7 Icon smoothing subsystem update (#17383)
* sfasdf

* sfsaf

* sadfas

* sdfasdf
2023-09-27 10:23:15 +00:00
Wowzewow (Wezzy)
fd26ff32e2 Fixes Examine Crashes (#17430)
* Fixes Examine Crashes

* fukken indentations
2023-09-27 10:22:04 +00:00
RustingWithYou
0c5ea41216 Hivenet Electronic Warfare + Black K'ois Tweaks (#17234)
* hivenet emergency transmission

* no phoron + harder to remove

* a fuckton of stuff

* hive verbs

* hive admin verbs

* admin verbs again

* encrypt

* mute

* Camera Access, Neural Shock & More

* electronic warfare

* changelog

* changelog 2

* more changelog updates

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update html/changelogs/RustingWithYou - willofthequeens.yml

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* test failures begone

* ok, now test failures begone

* addresses requested changes

* more requested changes

* missing span classes

* fullshield

* traits!

* addresses requested changes

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/admin/topic.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
addresses requested changes

* Update code/modules/mob/living/carbon/human/human_powers.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* hivenet checks to proc, admin socket to var

* Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* parasite.dm span fixes

* spacing

* purge a couple unnecessary returns

* fuck your spaces

* dominia is right bots should be destroyed

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-27 09:19:00 +00:00
Fluffy
040cbe81f1 asdf (#17447) 2023-09-26 20:10:51 +00:00
Fluffy
ee074974c0 Diona / Nymph language learning and messages (#16266)
* Changes + changelog

* sfa

* sdaf
2023-09-26 18:18:42 +00:00
Fluffy
173f73ae27 sfas (#17446) 2023-09-26 18:15:27 +00:00
Cody Brittain
0db705d678 Implant Improvements (#16905)
* Modernize and improve implant code

* Lint fix

* Fix initialize hint in implant cases

* fix tabulations

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-09-24 22:41:02 +00:00
Fluffy
955102ef4d More spacemandmm harnessing against bad code (#17376)
* sdfaf

* ssdasd

* dfsd

* try to apply a linter to spot violations of editorconfig

* sfdas

* asf

* sadfas

* sfasf

* asfsda

* sdaf

* sfsad

* totally not for testing

* aaaaaaaaaaaaaaa

* asfsadf

* saf

* sdfaf
2023-09-23 13:46:26 +00:00
Geeves
98f088d4ea InUs Game-Helm Upgrade (#15684)
* InUs Game-Helm Upgrade

* forgor

* bribed
2023-09-23 10:26:42 +00:00
Geeves
f6f018d8d5 Grab Stuff (#16337)
* Grab Stuff

* Extra Stuff

* typo on main

* matt changes

* update cl
2023-09-22 21:48:25 +00:00
Geeves
46a740eea1 TGUI Flavour Text (#17363)
* TGUI Flavour Text

* cl

* we love linetrs
2023-09-20 11:35:13 +00:00
RustingWithYou
202a050dcb beleaguered bisexual buffs big bugs with blasé (#17325) 2023-09-19 09:58:20 +00:00
Geeves
f7ae74efca More Ta Fixes (#17350)
* More Ta Fixes

* wing bugginess fix

* cl

* floating chat offset
2023-09-16 10:45:24 +00:00
Wowzewow (Wezzy)
652a3d02d4 Adds Storage Container Animations (#17329)
* Much ado about the Bagginses

* god i hate manually mapped shit

* Update code/game/objects/items/weapons/storage/storage.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* fixes

* yes

* Update code/game/objects/items/weapons/storage/bags.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-16 10:33:52 +00:00
Fluffy
b752616c98 Spacemandmm galore #1 (#16672)
* dmdoc + Initialize

* no errors anymore

* removed duplicate comment, expanded the other

* changelog

* gdf

* fix emotes F4
2023-09-14 10:39:15 +00:00
Wowzewow (Wezzy)
462115b501 The Pumped Up Kicks Update (#16265)
* The Pumped Up Kicks Update

Shoes. New shoes. Look at them.

* WELCOME TO THE UNDERGROUND

* for the love of crust

* turns out a var already existed for that but was never implemented ffs

* face it you're never going to make it

* these are winter boots

* removes Paradox's Thinly Veiled Fetish

* shiit

* Apply suggestions from code review

* Update code/modules/clothing/shoes/oxfords.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* oops

* fuck this file

* nice balls, bro

* check out how hard i can pee

* pissing on the moon

* caligaeae

* pee pee poo poo man

* fixes

* damn you

* merge fixes

* knees more

* damn you merge conflict

* fix

* fixes 2

* riding boots

* truly, this fixes things

* dammit ctrl s

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-13 11:29:03 +00:00
atteria
29f380b657 Simplemob AI Tweaks (#17299)
* ai tweaks

* check cleanup
2023-09-13 10:44:00 +00:00
Fluffy
62eb3bf50f Qdel diona metabolism and dionastat (#17322)
* Atomization

* dsfa

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-09-12 10:38:13 +00:00
Geeves
f34c28d945 Vaurca Breeder Fixes (#17309)
* Vaurca Breeder Fixes

* Remove Whitespace

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-11 21:19:45 +00:00
Fluffy
4528b289f3 QDEL'd actions no longer get readded to the HUD (#17317)
* Atomization

* sadf

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-09-11 10:22:18 +00:00
Geeves
a5dac3bc0a Big Mob Preview Fixes (#17308)
* Big Mob Preview Fixes

* more cl
2023-09-11 10:21:56 +00:00
Fluffy
500f923763 Qdel carbon metabolism (#17318)
* Atomization

* sdf

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-09-11 10:21:49 +00:00
Geeves
4c7e9e4ff2 Nearsighted Camera Fix (#17124)
* Nearsighted Camera Fix

* fluffy changes
2023-09-09 12:20:56 +00:00
Cody Brittain
ce5ac79e3c Split examine verb and function, and improve it (#17251)
* Split examine verb and function, and include adjacency and distance checking in examine function

* Fix various issues

* Update code/modules/mob/examinations.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Add required define vars

* Update code/game/objects/items/stacks/wrap.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-09 08:07:36 +00:00