Commit Graph

404 Commits

Author SHA1 Message Date
SkyratBot
dc57d5edd9 [MIRROR] Vending machines now use their name as a title for their UI [MDB IGNORE] (#8514)
* tgui: Vending machine titles (#61780)

* Vending machines now use their name as a title for their UI

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-10-01 03:03:34 +01:00
SkyratBot
ed1398425c [MIRROR] spaces -> tabs in vendor code [MDB IGNORE] (#8480)
* spaces -> tabs in vendor code

* Update engivend.dm

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-01 00:12:18 +01:00
Gandalf
25ec4ee713 E 2021-09-28 04:12:30 +01:00
Gandalf
7d29c83630 Moves all vending machine items to a modular folder >:) (#8436)
* FIX THIS SHIT

* Update vending.dm

* Update modular_skyrat/modules/modular_vending/code/vending.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/modular_vending/code/vending.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-09-27 21:14:40 -04:00
SkyratBot
ec84d03d09 [MIRROR] FAMILIES 4.0: "fuck it, MRP only this time" (#8420)
* FAMILIES 4.0: "fuck it, MRP only this time"

* F

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-28 00:08:13 +01:00
SkyratBot
8e2fb2b105 [MIRROR] Adds SEAFOOD foodtype, felinid diet changes (#8343)
* Adds SEAFOOD foodtype, felinid diet changes (#61506)

* Adds SEAFOOD foodtype, felinid diet changes

* Update felinid.dm

Co-authored-by: JosephJomama <60072879+JosephJomama@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 18:24:33 +01:00
SkyratBot
df4e163266 [MIRROR] Razor Update (#8310)
* Razor Update

* Update games.dm

Co-authored-by: remuluson2 <remuluson2@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-23 01:32:11 +01:00
SkyratBot
7ffa436d0a [MIRROR] memories are no longer added if the target isn't aware of them. (#8299)
* memories are no longer added if the target isn't aware of them. (#61375)

Fixing an oversight with the memories system. Memories shouldn't be added to people who aren't possibly aware of them.

* memories are no longer added if the target isn't aware of them.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-09-20 23:21:27 +01:00
Chloe
484d5523b8 [Ready] [Semi-Modular] [Donator] Holocigs (#8086)
* lol

* sex

* Update ciggies.dm

* Update donator_personal.dm

* oops

* Forcing ci

* screm

* In this world you're either the smoker or the smoked

* oops
2021-09-14 00:33:27 +01:00
Gandalf
b2870e568b 0 2021-09-14 00:23:15 +01:00
Gandalf
d7c0c32d98 map resetEEEE 2021-09-14 00:20:59 +01:00
Gandalf
96cb19801d EEE forgot a PLOR 2021-09-14 00:00:44 +01:00
SkyratBot
e510e35167 [MIRROR] [READY] Adds memory system, and engraving walls with chisels (#8066)
* [READY] Adds memory system, and engraving walls with chisels

* EEE

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:36:51 +01:00
SkyratBot
04302a770a [MIRROR] moves obj_integrity and associated procs to the atom level (#8016)
* moves obj_integrity and associated procs to the atom level

* Feex good

* Whoops forgot the maps

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-10 16:47:01 +01:00
SkyratBot
879c955538 [MIRROR] partially fixes medical phobia by splitting dice bags off of pillbottles as a subtype (#7962)
* partially fixes medical phobia by splitting dice bags off of pillbottles as a subtype

* skyrat fixes

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2021-09-06 08:05:47 -04:00
death and coding
222a5dca6d [modular][ready]adds a fashionable baseball cap (#7780)
* [modular][ready]adds a fashionable baseball cap

* Update head.dm

* the rumors were true....

* Update head.dm

* timb living ass

* huh

* improved sprite

* Update head.dmi

* ok there

Co-authored-by: louiseedwardstuart <bonniefluff>
2021-09-01 17:43:41 +01:00
Useroth
f900b1ec6d [MDB IGNORE] Eliminates Toxins (#60619) (#7911)
Repaths everything referring to "toxins" while actually meaning either the room in science or plasma gas. While this PR might be disrespectful to our forefathers, given this is (I believe) a holdover from as far back as the Exadv1 days, this has constantly irked me since I started working with the code. None of the player-facing stuff has referred to plasma as toxin since before 4407 hit, besides the Toxins Lab, and yet all of the type-paths are still pointing at toxins, making it a nightmare to search for in a map editor, and making the code needlessly easy to confuse with that of toxin damage. So this just fires it into the sun.

Anything relating to Toxins, the science subdepartment, now makes reference to Ordnance instead. This felt fitting enough given the focus of the subdepartment is around the creation of and testing of explosives.
Anything relating to plasma gas has, fittingly, been made to refer to plasma gas.

Edit: Ah yes, I feel I should probably apologise off the bat for the size of this PR- the code touched is mostly atmos machinery and simplemobs, a few sprites here and there, and of course the station maps + a few offstation maps.

Makes the code more legible and makes mapping less painful.

(The payment has been made)

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:50:22 +01:00
death and coding
2285d96917 [modular][ready]very fashionable boots (#7703)
Co-authored-by: louiseedwardstuart <bonniefluff>
2021-08-23 16:17:19 +01:00
Snakebittenn
bd76a8a358 [SEMIMODULAR] Medical Bandolier (& One Fix) (#7696)
* pistolero

* the ammo too

* whoops

* Apply suggestions from code review

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* yeah

* wew

* there

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2021-08-22 19:25:23 -04:00
death and coding
313a941538 [modular][ready]transfers the old cowboy poncho to the neckslot and adds obj sprites for mantles (#7586)
* [modular][ready]transfers the old cowboy poncho to the neckslot

* blood b gone

* Update cloaks.dm

* FINALLY

* AAAAAAAAAAAAAAAAAAAAA FIXES

* Update neck.dmi

Co-authored-by: louiseedwardstuart <bonniefluff>
2021-08-17 13:46:05 -04:00
Gandalf
c46a2a7ac9 Ports pollution from Horizon - Original PR: https://github.com/hrzntal/horizon/pull/468 (Made by Azarak) (#7453)
* AAAAAAAAAAA

* pollution scrubbbies

* fires cause smoke, right? Also NSS journey has scrubbies

* washing things removes the smell!

* what the fuck were you doing last night

* Update temporary_pollution_emission_component.dm

* space turfs shouldn't have pollution

* Fix air now fixes smoke

* Update pollution.dm

* Update pollution.dm

* Update bonfire.dm
2021-08-15 23:41:20 +01:00
Pinta
0e4db4612a [NON-MODULAR] TTS Devices are now purchaseable from NanoMed. (#7381)
* Update medical.dm

* gosh I am dense

* makes it a premium item
2021-08-04 15:09:43 +01:00
SkyratBot
4610b0c43f [MIRROR] Fixes custom vendors (#7375)
* Fixes custom vendors (#60668)

* Fixes custom vendors

Co-authored-by: antropod <antropod@gmail.com>
2021-08-04 15:07:18 +01:00
GoldenAlpharex
e9bb28b4de [MODULAR] The Beret-lliant Update (#7243)
* There's so many of them...

* Beret-lliant!

* Shut up linters
2021-07-30 12:18:13 +12:00
SkyratBot
8a9ab67aad [MIRROR] That's it. *GAGS'ifies your berets* (#7097)
* That's it. *GAGS'ifies your berets*

* a

* Update head.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-28 22:21:49 +01:00
SkyratBot
c09c9d987b [MIRROR] Add Referee costume (#7164)
* Add Referee costume

* Update costume.dm

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-28 22:05:49 +01:00
SkyratBot
ff624e5ec0 [MIRROR] ANTI-TIDER-2500 (#7043)
* ANTI-TIDER-2500 (#60016)

Straight from CentComm's R&D lab, the
ANTI-TIDER-2500
is the ULTIMATE crowd-control device.
Tired of being harassed by the crew for petty reasons? Sick of permabrigged prisoners constantly rioting over soggy tofu rations? The ANTI-TIDER-2500 is for YOU! For the modest sum of 710 credits you'll finally be able to hose clowns and whiners alike in pepper spray!

Co-authored-by: coiax <yellowbounder@ gmail.com>

* ANTI-TIDER-2500

Co-authored-by: Malgover <56408561+Malgover@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
2021-07-26 15:40:07 +01:00
Tom
f3e00113b9 Spelling and grammar cleanup (#7041)
* spelling and grammar

* Update modular_skyrat/modules/customization/modules/client/loadout/neck.dm

Co-authored-by: Matthew J. <12817816+ZephyrTFA@users.noreply.github.com>

Co-authored-by: Matthew J. <12817816+ZephyrTFA@users.noreply.github.com>
2021-07-23 10:49:19 +12:00
death and coding
42436fad10 [semi-modular][ready]YEE HAW! More cowboy clothes! (#6984)
* [semi-modular][ready]YEE HAW! More cowboy clothes!

* the belt space

* Update _neck.dm

* pls work

* Update _neck.dm

* Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update cloaks.dm

* Update _neck.dm

* please work i beg you

* Update _neck.dm

* work please

* please

* Update wardrobes.dm

* create toggle_base

* update cowboylea to use new toggle base

* update loadout typeref

* actually tick the toggle base

* remove old toggle code

* rouge tab

* move location of toggle base

* forgot to call our init helper

* need to call action update on toggle dunce

* uhh lets hope this works

* subtype instead

* please help

* Update toggle_base.dm

* Update cloaks.dm

* WORK

* Update toggle_base.dm

* work

Co-authored-by: louiseedwardstuart <bonniefluff>
Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
Co-authored-by: Matthew <matthew@tfaluc.com>
2021-07-20 17:29:02 +02:00
Yawet330
8fca39c89e [SEMI-MODULAR]Neural Lacing (Or copyright infringement) (#6576)
* OH BOY

* Not even dying harder than possible will save you from being revived.

* weh

* more improvements

* more fixes and improvements

* adds le vendor options

* Adds cortical stacks to cargo

* aaaa

* syndie cortical

* oops

* DELACE MACHINE GOES BRRT

* Are you a believer?

* buffs cortical stack remover on traitors

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

Co-authored-by: Tom <tomforde4@gmail.com>

* Update code/modules/mining/machine_vending.dm

Co-authored-by: Tom <tomforde4@gmail.com>

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

Co-authored-by: Tom <tomforde4@gmail.com>

* Update code/modules/mob/living/carbon/death.dm

Co-authored-by: Tom <tomforde4@gmail.com>

* Update modular_skyrat/modules/neural-lacing/code/delacer.dm

Co-authored-by: Tom <tomforde4@gmail.com>

* Update modular_skyrat/modules/neural-lacing/code/implanter.dm

Co-authored-by: Tom <tomforde4@gmail.com>

* Update modular_skyrat/modules/neural-lacing/code/stack.dm

Co-authored-by: Tom <tomforde4@gmail.com>

* Update modular_skyrat/modules/neural-lacing/code/stack.dm

Co-authored-by: Tom <tomforde4@gmail.com>

* Update modular_skyrat/modules/neural-lacing/code/stack.dm

Co-authored-by: Tom <tomforde4@gmail.com>

* Update modular_skyrat/modules/neural-lacing/code/stack.dm

Co-authored-by: Tom <tomforde4@gmail.com>

* Update delacer.dm

* aa

* a

* Update stack.dm

* weh

* More featureees

* Believer bundle

* i am deranged

* Update implanter.dm

Co-authored-by: Yawet330 <memeusniceus@gmail.com>
Co-authored-by: Tom <tomforde4@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-07-13 10:38:04 +01:00
Tom
555d2e383a [Modularish] Adds hairbrushes (#6670)
* adds brush

* a

* bald check

* add to vending machines

* x
2021-07-03 22:29:02 +01:00
SkyratBot
27865593b9 [MIRROR] New contraband peanuts (#6666)
* New contraband peanuts (#59638)

Adds a new variety of peanuts to Getmore
Tweaks peanuts to have a higher price, since they're currently the best thing to buy in the vendor.

* New contraband peanuts

Co-authored-by: YakumoChen <king_yoshi42@yahoo.com>
2021-07-03 22:27:11 +01:00
death and coding
35cd037773 [modular][ready]adds a bald and poly clown mask (#6538)
Co-authored-by: louiseedwardstuart <bonniefluff>
2021-06-28 14:23:49 +01:00
Gandalf
221bc79f7c FUCK 2021-06-27 02:13:33 +01:00
death and coding
c00554787a [modular][ready]adds the new boots to the vendors (#6469)
Co-authored-by: louiseedwardstuart <bonniefluff>
2021-06-26 04:02:24 +01:00
death and coding
54d378bb54 [modular][ready]adds the pencil skirts to loadout, vendor, and existance (#6490)
* [modular][ready]adds the pencil skirts to loadout, vendor, and existance

* Update code/modules/vending/clothesmate.dm

Co-authored-by: Matthew J. <12817816+ZephyrTFA@users.noreply.github.com>

* removes newline

Co-authored-by: louiseedwardstuart <bonniefluff>
Co-authored-by: Matthew J. <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-06-25 13:18:31 +01:00
OrionTheFox
078998de2c Adds various Departmental warning tapes (#6376)
* POLICE TAPE WOO

hmmgh

* Much things, read desc

Placed tape is a structure now instead of an item, door sprites are actually torn, all code besides destruction works (mostly)

* TAPE WORKS 99%

just need to have a visual for lifted tape..

* Adds lifted visual + starts on making tape obtainable

ahgghbkaghb

* finishes the vendors. 100% complete(?)

AAAAAAAAAAAAAAAAAAA

* detdrobe vending

abghb

* lifted alpha is better

hbgb

* change opacity hngh

* indentation bhgjknbg

im so tired

* walking can crumple the tape too

* desc
2021-06-19 21:51:31 +01:00
death and coding
85416c3655 [semimodular][ready]fixes the parka, digi ira uniform, and adds trousers (#6353)
Co-authored-by: louiseedwardstuart <bonniefluff>
2021-06-16 23:49:51 +01:00
death and coding
bdaab78815 [semi-modular][ready]one new loadout item, and some contra (#6341)
* [modular][ready]one new loadout item, and some contra

* Update uniforms.dmi

* maybe

* betta

Co-authored-by: louiseedwardstuart <bonniefluff>
Co-authored-by: louiseedwardstuart <bonniefluff@protomail.com>
2021-06-16 19:35:29 +01:00
SkyratBot
7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot
75b3b2bc8b [MIRROR] Lizard Food: a Taste of the Homeworld (#6281)
* Lizard Food: a Taste of the Homeworld

* Mirror!

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-14 18:36:47 +12:00
SkyratBot
6f3b151bb8 [MIRROR] Fixes a bunch of harddels that are sourced from player action (#6252)
* Fixes a bunch of harddels that are sourced from player action

* Mirror!

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-11 03:13:33 +01:00
death and coding
e490b434ed [nonmodular][ready] adds loadout stuff to the everyone vendors (#6236)
* [nonmodular][ready] adds loadout stuff to the everyone vendors

* ahhhhhh

* Update clothesmate.dm

Co-authored-by: louiseedwardstuart <bonniefluff>
2021-06-10 23:47:51 +01:00
death and coding
df4ea93ead [semi-modular][ready] vendors now get a bunch of loadout job locked stuff (#6163)
* [modular][ready]adds the sec ushanka to the vendor

* Update vending.dm

* cargo, chap and med

* hl scientist

* Update head.dm

* Update wardrobes.dm

* UHHHH

Co-authored-by: louiseedwardstuart <bonniefluff>
2021-06-10 08:53:12 +12:00
SkyratBot
fc16238547 set_anchored() (#59532) (#6191)
Co-authored-by: Rohesie <rohesie@gmail.com>
2021-06-09 10:39:40 +12:00
SkyratBot
c03eeaa918 [MIRROR] GAGs modular Winter Coats (#6157)
* GAGs modular Winter Coats

* Mirror!

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-06 13:29:11 +12:00
SkyratBot
52631dd7db [MIRROR] Ported hair gradients from TGMC. (#6156)
* Ported hair gradients from TGMC. (#59435)

* Ported hair gradients from TGMC.

* Removed preferences. Added hair spray. Added the colorist quirk.

* Adds 2 new longer fade variants

* Added to vendor. Added to goodies.

* Added the sprite for the spray.

* Grammar!

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

Co-authored-by: Emmett Gaines <ninjanomnom@ gmail.com>

* Doccing and newline.

* Reviewies concerns adressed.

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

Co-authored-by: Emmett Gaines <ninjanomnom@ gmail.com>

Co-authored-by: NamelessFairy <40036527+NamelessFairy@ users.noreply.github.com>
Co-authored-by: Emmett Gaines <ninjanomnom@ gmail.com>

* Ported hair gradients from TGMC.

* Mirror!

Co-authored-by: Cimika/Lessie/KathyRyals <65850818+KathyRyals@users.noreply.github.com>
Co-authored-by: NamelessFairy <40036527+NamelessFairy@ users.noreply.github.com>
Co-authored-by: Emmett Gaines <ninjanomnom@ gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-06 13:03:03 +12:00
SkyratBot
7629321f58 [MIRROR] Makes DeusVend's naming scheme consistent (#6155)
* Makes DeusVend's name scheme consistent (#59500)

* Makes DeusVend's naming scheme consistent

Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
2021-06-06 11:48:04 +12:00
SkyratBot
65162686a4 [MIRROR] Renames chaplain vending machine (#6134)
* Rename chaplain vending machine to DeusVend (#59472)

* Renames chaplain vending machine

Co-authored-by: bawhoppen <Bawhoppen@users.noreply.github.com>
2021-06-05 16:42:49 +12:00
SkyratBot
243275c171 [MIRROR] Makes washing machines support GAGS recoloration (#5950)
* Makes washing machines support GAGS recoloration (#59292)

* Makes washing machines support GAGS recoloration

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-05-25 21:33:19 +01:00