7751 Commits
Author SHA1 Message Date
99e910602f Adds option to select out of 3 Syndicate Bundles (#23465)
* Thanks Ebba

* removing that one datum line

* updated description in uplink

* removes redundant list that is redundant

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Moved Comments

* Added Agent Spaces

* added a dot

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update descrption + fix typo

* updated TC prices in comments

* Welcome message + bundle name updates

* Station Name

Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>

* Modsuiter to Augmented

Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>

* 3TC jacket comment

* Beacon + Naming + Comments

* forgot to save this file

* Empty

* slash formatting

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

* old SRC style

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

* item/item as anything in item

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-11 17:05:29 +00:00
SadhorizonandGitHub e5910559a6 Adds robotics bags. (#23433)
* I present: bags! wowie...

* oops

* this should fix pierre

* changes

* forgor
2023-12-11 16:58:59 +00:00
a5555a87eb Tools now fit in all versions of the military belt (#23428)
* Tools now fit in all milbelts

* comments

* consistency

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-12-11 16:58:38 +00:00
SadhorizonandGitHub d3ff8c9921 Resprites lockets, makes necklaces craftable. (#23387)
* lockets!

* this shouldn't need directionals, actually
2023-12-11 16:56:44 +00:00
DaylightandGitHub 6275852fe9 Removes Unused Settings From Game Preferances (#23368)
* Removes all reference of ROLE_NINJA

* By public demand
2023-12-11 16:56:08 +00:00
GDNandGitHub 864fe29734 defib tweaks (#23277) 2023-12-11 16:54:20 +00:00
004d7d10b7 Refactors is_hot and fixes some issues from the beaker lighting PR (#22964)
* Idk what I'm doing

* The is_hot refactor

* Fixes that I forgot to push before making the PR

* Update code/game/objects/items.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Contra review

* TODO: Find out why this isn't working

* Removes the signal stuff for now, this works

* Fixes it all

* Add new signal

* Update code/_onclick/item_attack.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Contra reivew

* Ayyy it works

* Merge master

* Forgot this one

* Update code/game/machinery/doors/airlock_types.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/objects/structures/mineral_doors.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/turfs/simulated/floor/mineral_floors.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/turfs/simulated/walls_mineral.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-12-11 16:53:51 +00:00
cbc45c1336 Pneumatic Cannon Refactor (#22956)
* camelcase and snakecase on the same line...

* the rest, i dunno

* PERIODDDDTTTTTT

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* the

* new variable name

* don't need that

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* lewc's suggestions + new fun var to play with

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

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

* bjam's suggestion

* adjusting settings is now a seperate proc

* swap some stuff around

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-11 16:53:11 +00:00
AylongandGitHub 825c2c8866 Converts Input List to TGUI Input Lists (#23396)
* Part 1

* Testing 1

* Revert "Testing 1"

This reverts commit fc06554b28.

* Part 1.1

* Part 2 - UI Style List

* Preferences lists

* Preferences lists - DONE

* More inputs

* MOOOOOORE

* UI style else

* Last ones

* Double name fix

* Pre-selected Search

* Return Pick Darkness

* Return Pick Darkness

* Missing users

* Some review changes

* Revert MULE lists

* I just hate MERGE CONFLICT label

* List window tweaks

* I think there it is

* why i am stopid

* Update tgui.bundle.js
2023-12-10 19:38:23 +00:00
SadhorizonandGitHub a4fb22eb9a Adds kidan radio sprites. (#23330)
* they finally can see...

* uuuh, this file too

* headphone fix
2023-12-07 16:22:41 +00:00
DGamerLandGitHub 7a53a3e90c Fixes welders costing welding fuel for empty clicks (#23390)
* Nice

* Yeah this is better
2023-12-06 15:36:37 +00:00
5f479ea457 Adds a new drip option - cloth handwraps! (#23339)
* drip

* this is unneeded actually

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

sure.

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* flips item sprite
for now, at least

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-12-06 15:34:15 +00:00
1f87a821e1 Head of Personnel drip (#23305)
* everything

* dress sprite adjust

* grey coat

* Update code/modules/clothing/under/jobs/civilian.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* corgi time

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-12-06 15:32:16 +00:00
Henri215andGitHub 79502445a9 Soap resprite (#23250)
* Soap resprite

* other soaps in hands
2023-12-06 15:31:13 +00:00
9ce6730c56 removes the fluff item from moonbase, modifies loot (#23157)
* removes the fluff item from moonbase, modifies loot

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

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

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* compiles

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* pick my hated

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-12-06 15:27:45 +00:00
ed6adfc7b2 Desert Course - Ice-Cream Edition. Ports Frozen based deserts from TG. (#23099)
* We all scream for ice-cream

* consistantcy

* the despacening

* Sirryan review.

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-06 15:27:21 +00:00
ChristasmurfandGitHub a4c0c2f40d Resprites the mime backpack - Pierre the Panda (#23287)
* sprites

* pierre not pete

* description update

* description 2 electric boogaloo
2023-11-29 12:37:48 -05:00
QwertytofortyandGitHub 09712e1541 makes 2 wizard weapons less of a pain to use. (#23356) 2023-11-29 12:15:40 -05:00
HMBGERDOandGitHub 28e54f96b2 make dualsaber great again (#23361) 2023-11-29 12:14:05 -05:00
e5bbcc1b3f Fixes sord inhand sprite (#23393)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-29 12:10:04 -05:00
Henri215andGitHub 6a109ade7f Moves a few sprites out of items.dmi (#23301)
* fuck you items.dmi

* banhammer
2023-11-24 15:39:20 +00:00
Nathan WintersandGitHub 0bbc523dad Adds colored shoes to loadout, makes satchels craftable (#23293)
* Add colored shoes to loadout

* Allow crafting of satchels
2023-11-24 15:38:12 +00:00
GDNandGitHub 18bc75363f fixes water backpacks not being able to have their miser be toggled by clicking on it while it's on your back (#23288) 2023-11-24 15:37:49 +00:00
HMBGERDOandGitHub 53f6b905e6 customised_abstract_text - removed useless check, changed var (#23282)
* customiZed, removed check that is not needed

* one more typo

* fuck it this is right in brenglish

* not need /human here

* even better
2023-11-24 15:36:24 +00:00
4b3a720d96 Removes boxes from the uplink PART 1 (#23189)
* removes boxes part 1

* shorter desc for nano injector

* yeahsure1

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* yeahsure2

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* yeahsure3

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* ok no more kit

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-24 15:33:25 +00:00
DGamerLandGitHub 429981e797 Nerfs baton throwing (#23241)
* Ezpz

* Removes unnecessary text

* Adds the sound back

* Baton now stuns the hit person

* Present tense
2023-11-24 15:32:07 +00:00
4a3437355e HUDs can now only change status with sufficient ID access (#23086)
* Added mental to MedHUD

* Made HUDs write based on ID access

* Makes Chamelion secHUD have write access

* adds trailing newline in defines

* med examine spacing adjustment

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* sec examine spacing adjustment

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* 0 and 1s

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* removes the sec_hud_set call, probably a bad idea

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-24 15:29:59 +00:00
7181d869d7 Buffs His Grace (#23040)
* This should be most of it

* I forgor to push this

* Makes this look better too

* Slight last things

* This has to be 0

* Fixes everything being broken all at once

* Fixes ascension eating the owner

* Extra insurance

* Removes debug messages

* The most minor of optimalizations

* Sirryan review

* Cleaning up the files

* Update code/game/objects/items/his_grace.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Removes unneeded variables + Lewc review

* Ternary my beloved

* Checks the correct thing

* Less bloodthirst per second and back to 25 victims

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-24 15:29:13 +00:00
GDNandGitHub 637373cafb fixes some issues with defibs (#23276) 2023-11-22 11:09:58 +01:00
AdrerGitHubadrermail@gmail.com <adrermail@gmail.com>
a169176829 Make dicebag not a pillbottle subtype. (#23121)
* Make dicebag not a pillbottle

* Fix all other references

* Map update

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-11-21 23:09:03 +00:00
207e35cddf Adds 3 ipc only implants. (#22798)
* FUCK fix drugs first

* done just wait for prs to be merged (sorry s34n)

* removes uneeded chest implant redifine, repair implant

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* !human, fluid

* guard variable lisst

* oops

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/surgery/organs/organ_external.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* lewcs good to them?

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* not needed

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-21 16:19:39 -05:00
307120e7d3 Patches and pills are now no longer subtypes of food (#23063)
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

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

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

* Some missed patches

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/patch.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-21 15:37:16 +00:00
OctusandGitHub ba44b18102 Removes Barber because its a poorly designed role (#23053)
* solong

* test

* update

* fixififixx

* ok back to barbers

* spring cleaning

* i hate you safety scissors, genuinely

* space fix

* reviews

* Update sechud.dmi

* Update card.dmi
2023-11-21 13:10:13 +00:00
DGamerLandGitHub be1f2d9e54 The fix (#23290) 2023-11-16 20:08:49 -05:00
dj-34andGitHub 25c3980998 Fix item state of flashlights & cult mirror shield (#23211)
* Fix item state of flashlights & cult mirror shield

* update by request
2023-11-14 13:13:10 +00:00
GDNandGitHub 8b874ada80 using the storage implant's action button while it's activated now closes the implant (#23182) 2023-11-14 12:53:13 +00:00
e2ffb8a882 Engineering borg nerf (just their decompiler ;p) (#23227)
* Engi borg nerf

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/food_and_drinks/drinks/drinks/bottle.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/friendly/lizard.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/projectiles/ammunition.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/chemical_bottle.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update lighters.dm

* Update spiders.dm

* reverts some that maybe should stay

* oops

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-11-14 12:51:13 +00:00
48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777)
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* fuck

* bah

* Update tools/ci/check_grep2.py

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-12 20:59:43 +00:00
GDNandGitHub 35754c77ea Verb cleanup (#22224)
* Verb cleanup

* rest of the object verbs

* little more object cleanup

* more changes

* last of it

* this too

* tgui

* code review

* time to go
2023-11-12 20:19:17 +00:00
DGamerLandGitHub d19ea0026c Fixes vendor refills not working (#23193)
* What a fucking shitshow

* Examine fixing

* Update code/game/machinery/vendors/vending.dm
2023-11-12 20:04:47 +00:00
ppi13andGitHub 760c415c58 Fixes-an-oversight-with-emagged-lockboxes (#23144) 2023-11-12 19:44:24 +00:00
BakafaceandGitHub 41f6620c2a Adds cheese to the cheese (#23218) 2023-11-12 09:18:06 -06:00
d3f85c6b67 Adds a new loadout to wizard: Fireball. (#23115)
* just fireball.

* requested changes

* review

* Apply suggestions from code review

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* review

* oops

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2023-11-08 08:52:48 +00:00
2b67a00131 Adds HOP beret (#22919)
* Added HOP Beret

* adjusted beret object sprite

* proper variable order style

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* added Vox & Drask Version

* Added to loadout

* checkout new hats

* re-add newer hat

* put actual hat path in loadout

* Not used the cool merging tool made in python

* apostrophes are for captains only

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* adds sprite sheet

I think it worked fine without it?

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-08 08:51:37 +00:00
Henri215andGitHub bc095ad398 Adds Whistles to the game (#22729)
* Porting whistle from CMSS13

* species variations

* lets kill the conflict

* adding it back

* new whistle sound
2023-11-06 15:51:45 +00:00
23e2c250ec Adds soil clumps and a compost bin. (#22585)
* Adds soil clumps, which are used to make soil(alternative to sandstone).

* Adds soil clump recipe to the biogenerator

* Adds the compost bin to the game. Which converts biomass to compost and makes soil from it.

* Adds sprites for the compost bin

* Adds a recipe for the compost bin(10 planks)

* Added interface for the compost bin.

* Applying suggested changes to compost bin(redundant condition removal, spell check, auto doc)

* Applying suggested changes to soil sheets(initialize, remove empty line)

* Changed min and max to clamp where able, removed redundant return, compost recursion stays in convert_biomass().

* Call parent on init

* Identation and style changes

* Rephrase description

* Unauto docing unnecessary bits, clicking with screwdriver no longer an attack, removed redundancies, reordred ui procs and changed ui data list to new format.

* Converting plant to biomass is now its own function

* removed SOIL define. using path as is instead

* Moved the compost_bin-3 sprite up a pixel so it aligns with the rest

* Added spaces for readability

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Moved plant deletion to make_biomass()

* Rebuilt tgui

* Filled gaps in sprite with mostly transparent pixels to make it easier to click

* Rebuild tgui

* rebuild tgui

* Adds the soil clump sprites back after update

* Added Trailing newline to compost_bin.dm

check said it's missing

* Adds a check for presence of biomass when initializing to prevent unneeded proc call

Checks whether a compost bin has any biomass before attempting to compost it.

* Adding back compost bin icons

* rebuild tgui

* Made interface window slightly shorter.

from 300 to 200 pixels tall.

* Replaced the enough_compost() proc with an if statement in the only place it was used

* Replaced the compost() proc and calls to it with process().

* Rebuild TGUI

* Removed an unused var, idented a comment, and returned the onhit proc to it's original form

* Ran prettier on the compost bin interface file

* Wake Up Icon Diffbot

* Aw shit, here we go again.

* Empty-Commit

* Wake up icondiffbot

* Last attempt for today

* Removed redundant new line from sheet_types.dm

* removed redundant new lines and moved the ui procs together.

* Changed compost label to Compost

* Recompile tgui

* Rebuild Tgui

* Rebuild TGUI

* Rebuild TGUI

* Capitaliize the word soil in the biogenerator listing for it

* following some suggestions

Replaced compost capacity defines with "magic numbers", removed redundant init proc, added spaces around a '-' sign.

* Removing a redundant check in the insertion proc.

moved the check for the compost bin being full to the end of the loop since I already make one before the loop starts.

* Rebuild TGUI

* Rebuild Tgui

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

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

* Rebuild TGUI

* ReRebuild TGUI

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-11-04 16:42:07 -04:00
SchrodingersWolfandGitHub e6addfc6ac Belts and some select belt slot items no longer require a jumpsuit to wear (#23038)
* Why wear clothes when you can wear belts?

* Converted the ignore_under var into a flag
2023-11-04 16:37:01 -04:00
BjamchamandGitHub 29351efba7 Changes the powerfist to work off pressure (#23069)
* the power of the ideal gas law

* define R
2023-11-04 16:35:00 -04:00
Venuska1117andGitHub d24f77400e Space Ruin: Rework Syndie Research Base (#22721)
* Rework Syndie Research Base

* Fixing

* Fixing..

* work you cu-

* SPAACE

* Pack of changes:
- Removed Toilets and replaced them with "Dressing" room.
- Added Genetics, because person on discord wished for it.
- Placed Atmos pipes (scrubbers and supply)

* Changes:
- Added Pathing for ed209 (syndicate)
- Removed random_spawners custom spawner made before.
- Added "security" room with allow you to control turrets and see all base cameras.

* Fixing turret control panel

* Fixing turrets.. again

* huh?

* Changes:
- Decreased Beacons amount from 20 to 10 (they give same path, just less stops).
- Added special room to "store" ed209 syndicate, if you want to activate it: View Variables -> patrol = 1.
- Added light switches everywhere.
- Added Air alarms and fire alarms everywhere, and made sure there are fire doors to stop potential fires.
- Added 2 more areas, Genetics and "control room".

* Placed Power Cables.

* Added disposals
Lets fuckign Gooooo

* Changes:
- Made button from drive actually open doors and shoot stuff to toxin range.
- Added emergency PACMAN generator, in case someone join late and whole base will be de-powered.
- Added CCTV to caves, now you can see intruders.

* Added 2 more boxes of plant disc.

* Changes:
- Added new variant of free drobes, now syndicate can get drip for free.
- Added "hidden" safe at vault with contain 10000credits and stethoscope nearby to help, its only for syndicate researcher, if explorer steal it, they should get bounty on them by syndicate.
- Added a lot of vendors refilling units, to make sure that you cannot run out by "accident".

* Changed Toxin Test arena to indestructable walls.

* Bunch of Changes:
- Replaced "grenade casings" (with are foam grenades) with new created "Foam Grenades Box" so its more oblivious what it is.
- Added paper note near PACMAN Generator with contain basic instruction how to use it.
- Added missing fire doors for "drooms".
- Added fire extinguishers EVERYWHERE so syndicate OSHA will be happy.
- Changed "genetics" room, now instead of supporing 4 people, it support now only 2 in exchange for "faster" DNA researching.
- Added "Foam Grenades Box" around base and in storage, so if there any breaches just throw kanu- grenades at them.
- Named and connected disposal to "toxin launcher" so now you can disposal your constractions inside.
- Added 4 buttons for "Chemical" testing room (with is not for explosives) so now you cannot get trapped inside.
- Made special disposal Ride for genetics "monkeys" to turret so they will be killed (its made this way to avoid researchers spacing themselfs allowing them to escape)
- Increased Toxin Storage room, by increasing oxygen and plasma tanks amount by tanks 2 each.
- Moved AIR container to engine, now they are replaced with "tank container" to storage... custom plasma mixes without destroying main plasma containers.

* fixes

* Changed Genetics:
- Now genetics layout got changed, now instead of supporting 4 genetics people it only support 2 in exchange for more efficency in making DNA syringes.
- Now you can dispose bodies for turrets to shoot holes trough... its funny.

* Added Mirrors to dressing room-
And Fixed hallway curve

* Made cryo and sleepers face themselfs

* Added RPD for toxin launcher room
- now if you run out of valves, you can just "spawn" new ones.

* Used merge conflict fixing tool
- and for *some* reason it keep showing merge conflict? (whot)

* Requested changes:
- Replaced NT machine with syndie cigarette machine.
- Removed random blueshield note.
- replaced syndie donk machines to secured variant.

* Changes full build consoles to unbuild.

* Fixes:
- Fixed storage, somehow one rack with mats got exaporated.
- Added tachyon-doppler array for tracking explosion size.
- Removed duplicated buttons from toxin mixing room.
- Removed console and placed in storage.
- Storage now have items with offsets so they are more visible in stack pile.
- Removed Air alarm from toxing testing arena, considering it dont have pipes.

* Add RPD in toxing mixing

* batch of fixes (?)
- Changed Art vendor and critter care to free variant.
- Fixed spelling on paper to requested one.
- Now syndicate researchers spawn with 100 credits in their backpack for claw machine, if you run out, ask your coworkers to borrow more cash on game.

* batch of changes:
- Did most requested changes by S34N (except defib one)
- Added APC to hallway, so now hallway use power too.
- Made new subtype of syndicate APC's with offset depending on direction.

* fix stripes issue

* Removed random stripes and syndie having cash
2023-11-04 11:31:41 +00:00
7646af5f2f Bugfix/issue 22899/vendor restocking unit's description is misleading (#23130)
* assigns the item_state var the same color assigned to the icon_state var in the lighter/random/New() proc

* fixes the typo in deployable.dm

* oops

* changed the code in get_part_rating() so that non-full restock values get returned

* Changed vending_items.dm so that the vendor restocking unit's description isn't always full

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

lewcc suggestion

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-03 21:23:47 +00:00