Commit Graph

217 Commits

Author SHA1 Message Date
Zack
4219e9dbcd Changed airlocks to airlock helpers on NSS, Kerberos, NSS Cyberiad, NSS Cerebron (#23634)
* airlockhelpers

* did some things

* fuck you doors

* Guh merge conflict

* guh

* pipe layer

* pipes

* Update delta.dmm

* Shit my shoes are untied

* Update delta.dmm

* catewalks

* fixed what warriorstar-orion suggested

* git reset --hard HEAD~1

* fixed what warriorstar-orion commented

* guh random sign

* Fixed what S34N suggested

* added two things

* fixed a oopps

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-02-06 14:02:22 +00:00
TheKillfish
391f296ed9 Knuckledusters; New Ways to Beat People to Death in Style (#23685)
* Created Knuckledusters.dm

Time to see if this shit works

* Correct file now

I forgot to add .dm after making file. Oopsies.

* Delete code/game/objects/items/weapons/knuckledusters

Wrong file

* Fixes code and addes sprites

* Finished sprites, dusters can now be gotten

* Tweaks and fixes and additions

* Uplink description tweak

* Now they do more, thanks Snowball for help

* Syndiedusters look good now

* Tweaked values, added Engraved Dusters as steal objective

* Further tweak

* Removal of unnecessary space

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

* Tweaks from Henri added

* Gave admin variant new root name

* Autodocumentation of variables

I feel like an idiot not knowing how to autodocument, but feeling like an idiot is worth it so long as I learn

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

* Added some suggested changes/code cleaning

* Removes unecessary space, how do I keep missing these?

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-01-21 21:03:46 +00:00
DGamerL
db578cdc6f Makes food not a subtype of reagent holders (#23379)
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

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

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

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

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

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-21 19:00:02 +00:00
Qwertytoforty
50b6b5e7d1 Changes power gloves to a bio chip, buffs it. (#23622)
* wip

* it works yipee

* Update code/game/objects/items/weapons/implants/implant_shock.dm

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

* Apply suggestions from code review

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

* Did you know, in terms of making me suffer, full conflicts

* Update code/_onclick/click_override.dm

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

* yes

* Update code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-01-14 12:27:37 +00:00
Qwertytoforty
d668a29a60 Ports (most(ok like half)) station traits from tg. Ready for review into TM (#22334)
* no longer super sick time to port station traits in a 4 hour rush as you have lost control of your life

* some changes /fixes

* Apply suggestions from code review

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

* more changes

* oh right, the murders (uplink price tweaks)

* Update code/controllers/subsystem/SSjobs.dm

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

* Apply suggestions from code review

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

* compiles

* doesnt work but works better

* tgui dogs still sleep but I want to sleep

* it should finally compile now. Probably.

* Update tgui.bundle.js

* Sorry IAN, transfer components is shoddy as hell

* removes minor uneeded /tgui

* also extra line whoops

* final stuff

* reverting changes I made earlier is hard ok

* Weight change, uplink reference

* oh right, the hey fucko

* Update code/_globalvars/traits.dm

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

* Update tgui.bundle.js

* pushes

* pulls it

* Apply suggestions from code review

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

* more changes, ion rifle blocked on cyb revolution

* dipshit remove the debug / tgui pritier and such

* tgui

* updates tgui again as nanomap was merged

* Apply suggestions from code review

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

* comment / tgui

* every day I worry all day

* Full TGUI rebuild + prettier

* ah fuck

* leave a customer feedback at the link below!

* tgui momenr

* tgui moment

* FUCK I am dumb

* vertical TGUI

* She T's on my GUI till I

* Update tgui.bundle.js

* Apply suggestions from code review

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>

* Update code/modules/supply/supply_pack.dm

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>

* IPC can now use robotic hearts / pulse demon hearts and charge

* fixes revert not working for hangover / arrivals

* tgui moment

* hhgreg

* fixes that one bug

* Every day I worry all day

* deconflicted for real this t ime

* Update code/datums/station_traits/postive_traits.dm

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

* ch-ch-ch-changes

* Update SSjobs.dm

* Update code/modules/supply/supply_pack.dm

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

* deconflicted but won't pass CI

* fixes double dipping on traits

* my le consoles, they le no work?

* Great Great Asset, Asset, Great Great Asset, Asset...

* sorry slime mains

* fixes borgs being punished heavier

* actually fixes it, I was dense

* hopefully fixes borg drunk further

* makes it compile?

* actually makes it compile god whyyyy

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
2024-01-08 19:07:09 +00:00
DGamerL
382a71df0d Renames all typepaths + names of implants to biochips (#23172)
* The fix

* Contraaaaaa

* Fixes CI

* Fixes the pads + cases

* Uplink datums

* Update code/datums/mind.dm

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

* Update code/__HELPERS/unsorted.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/research/designs/medical_designs.dm

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

* Update code/modules/surgery/implant_removal.dm

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

* Outfits now use a proper variable name

* Fixes surgery (oops)

* More .dme changes

* Renames the folder

* Fixes bad merge

* Contra review

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

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

* Fixes CI fail

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-01-06 23:15:55 +00:00
Cocacolagua
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
Henri215
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
Venuska1117
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
matttheficus
7e7f03c906 Elite Tactical Magboots (#22968)
* here we go

* notes

* sprites

* this is needed

* some tweaks to gear

* nit

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

* fix this

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-10-31 18:35:05 +00:00
Qwertytoforty
3dc52b9f1f Reworks some trader pools. (#22969)
* oh boy let us have some heads roll

* le comma au chocolate

* perhaps we we want them to be able to build it

* mmm ice cream sandwich cereal

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

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

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

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

* lablled

* Apply suggestions from code review

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

* solcase

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-10-29 10:18:35 +00:00
Mitchs98
e8ab249eda First Course; Soups, Salads, Sandwiches! Splits food.dmi in preparation for future PRs. (#22866)
* ORDER UP

* whoops

* slimes ur jelly sammich

* whoops 2

* prettier pretty patties

* whoops 3

* the splittening

* Henri review

* contra review + repathening

* salad bowl

* contra review 3.0

* renamed plain burger to burger, clarified need for abstract item

* DG Review
2023-10-28 21:28:56 +02:00
Henri215
24cd97808e Fixes the black suit jacket from vendors and from uplink (#22807) 2023-10-13 14:24:39 +01:00
Henri215
a5783c7169 Adds new microtransaction method: Scratch Cards! (#22618)
* scratch cards!

* Apply suggestions from code review

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

* tweaking values

* maint loot tweak and to_chat

* sprites

* DGamerL review

* adjusting volume

* better like this

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-10-09 20:36:24 +01:00
Git-GoR
d31012330b The degrilling: map windows no longer have grilles under them unless electrified or space adjacent (#22273)
* Existing window spawners are not grilled
Adds new grilled versions of window spawners
Spawner icons modified accordingly, new non-grilled ones

* initial commit of map changes

* include all subtype (yellow etc) cables

* Re-grills cyberiad's space adjacent windows

* Re-grills delta's space adjacent windows

* Re-grills meta's space adjacent windows

* Re-grills cere's space adjacent windows

* Regrills all spacefaring windows in SpaceRuin maps

* Fix duplicated window spawners in main stations

* Fix bad delta windows

* Fix wrong meta windows, regrill QM office

* Fix couple of wrong windows in Cere

* Fix several cyberiad windows

* Adress review of missing windows in cere and delta

* Fix missing window in delta next to turbine

---------

Co-authored-by: Warriorstar Orion <orion@snowfrost.garden>
2023-10-05 19:35:46 +01:00
JimKil3
5450f598bf Adds the holo-cigar, a human-specific traitor item (#22062)
* badass trait

* the cigar

* sprites ft. mcramon

* makes it obtainable

* Apply suggestions from code review

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

* contra review

* Update code/modules/reagents/chemistry/reagents/medicine.dm

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

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

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

* henri review

* contra broke everything

* contra broke everything pt 2

* Update code/modules/clothing/glasses/glasses.dm

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

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

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

* lewc review

* update_icon_state

* Apply suggestions from code review

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

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

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

* are you happy now dgamer

* henri review 2

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
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-09-12 17:10:23 -04:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

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

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
SchrodingersWolf
86a8690907 Added the Armored Suit Jacket to both the Uplink and as maint loot (#22011)
* Added the armored suit jacket from the Agent 47,
Bond and Professional Bundle to the Uplink. Also
allowed it to be spawned as maint loot.

* Messed with main loot drop values

* Telecrystals son, they increase when exposed to inflationary pressure

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-08-28 13:15:33 +01:00
Qwertytoforty
76a845d380 Modsuits. Ready for review, sorry for the ammount of files changed 👉 👈 (#21147)
* biting off more than I can chew, but I feel like hurting myself

* more shit

* progress continues, moral stays sameish

* bite of 2587

* mod_theme down, but probably broken

* 385 errors, 16 warnings, zero tgui interactions

* 292 19

* final strech to buggy mess, break time

* it compiles. It almost fucking certainly doesnt work, but it compiles

* fudhsciffubgsbgpgb actions not working as should for modules

* fuck it we'll just open the pr as we work on it

* icons work now

* tgui stuff

* more progress

* JUDGEMENT

* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.

* jetpacks, gps, and go do what exo-suits yourself

* almost ready

* sorry to whoever has to review this

* should work™️

* should be good now

* pushing changes so I can do reviews next

* Apply suggestions from code review

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

* lore™️ Adds illegals level to modsuit parts from syndicate.

* early returns

* and these illegals

* no uplink reference idiot

* mod inhands are a good idea

* this is needed for inhands nerd

* Bomb detector working, modsutis cover ears. skin things

* overslotting removal, cyborg charging, ert loadout for gamma

* duplicated signal

* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.

* tether module, orb module, holster stuff

* built in no slip, cheaper 87

* removes modules already installed, engineer ert get jetpack, equip into modsuit storage

* comments spaces and duplicate flags

* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Compile TGUI, slowdown adjustment, Modsuit to MODsuit

* sonar, do after, more equipment, acid handling

* overlay bugs / ERT / DS suits autodeploy

* middle click action buttons

* traders, sec modsuit energy nerf

* surplus weighting

* Kinesis module.

* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis

* more power / unused module removed

* name, ds fix, pre equipped to cc suit

* depot / grammer

* ok should be good™️

* overslot, dupe gun, missing suit storage

* stealth nerf, new kit

* gun stuff  / ds theme

* bio armor is gone

* let me push changes please thank you

* makes shocks work right

* copies over some changes TG made to module prices after porting

* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-

* sirryans changes

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

* Update code/modules/telesci/gps.dm

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

* Update code/modules/telesci/gps.dm

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

* Control define, ERT / DS have gloves / boots again.

* Apply suggestions from code review

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

* More changes

* god I hate tgui. Why do all the bundles live underground, instead of in my basement?

* she updates my master till I testmerge

* modsuits can recharge again

* fixes a lot of shit

* Ready for TM probably

* sure fuck it whatever that makes sense I guess

* the pinpointer works better™️

* Another storage module bug fix

* hair and medical stuff

* fuck fuck fuck

* fixes sonar

* Bag exploit fixes / plasma runtimes / ear nerf

* dna lock improvement / cryostorage

* whoops

* Ball form second cooldown wasn't helping, no more infinite cores

* she springs my lock till I ***SNAP***

* plasmaman no longer die

* fixes modsuit emp issues

* atmos no longer fucking dies

* Fixes, module printing, and a restriction on newly constructed modsuits

* Inventory code my hated

* WOOO PREFERENCE CODE WOOOOO

* icons my hated

* fix for mods / spaceproof shit

* holy shit whhhyyyyy

* backpack first

* Update mod_theme.dm

* prevent infinite gun arms / infinite modsuit cores / syndicate modules

* fixes tm error

* scream loudly if species sprites break. They shouldn't, but, you know.

* deconflicted with luck

* converts to refit for species

* fix pathfinder

* fixes modsuits being funky power wise

* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit

* nerfs the atmos modsuit

* magboots for ds / CC modsuit

* downside of autosave: typing in wrong window saves bad stuff

* Gamma ERT have internal cameras again.

* spellcheck when

* ah fuck

* yes delete the null that works

* whoops

* fixes error / description

* un vulps your cannon

* fixes tails disapeering on base modsuits

* space to underscore

* tgui fix / tajaran

* springlock buff, cryopod fix

* u helps

* WHO PUTS A GUN IN ITEMS

* tgui moment

* mining modsuit nerf / hidden holster module

* PAIN

* UNATHI TIDE STATION WIDE

* I love special code

* slightly dense

* shark jumpscare

* fixes ghost item, fixes springlock being bad

* YIPPEEEE IT WORKED

* she decons my flict

* pain

* ebbas days are numbered :^)

* hidden

* r-r-r-ebuild

* fixes more bugs

* qwerty, you are dense

* fixes gps

* fix mulebot crate

* level fix

* adds back icon

* moving storage, fix bug, modules activate / deactivate message

* yeah

* yeah

* yeah™️

* steels requests

* windoors no longer make pathfinder module explode

* chat spam

* oil slicks + modsuits

* whoops

* bag check

* ofc

* Update code/modules/mod/mod_control.dm

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

* Apply suggestions from code review

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

* Update code/datums/uplink_items/uplink_nuclear.dm

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

* Update code/modules/mod/mod_control.dm

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

* Update code/modules/mod/modules/module_pathfinder.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-08-19 15:36:13 -05:00
Qwertytoforty
55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769)
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
2023-07-21 15:56:00 +01:00
Venuska1117
012e2c3052 Cerestation: Making Farragus Dirty (#21494)
* Making farragus dirty
- Now maintenances are dirty, and doors leading to them have chance to have dirt near them.

* test

* Changes:
- Remove "rare" dirt spawner.
- Add "maybe" and "often" dirt spawner.
- Fix "often" and "maybe" oil spawners sharing same path [...]/maybe, now they have their own paths.

* Fixing
-It now actually have changes stated before, for some reason it didn't save.

* Fixes Delta:
- Change 2 "rare" dirt spawners to "maybe" spawners, with remove issue.
2023-07-19 15:53:26 +01:00
AffectedArc07
8d7e066471 Adds OpenDream as a CI lint (#21099)
* Initial Commit

* Makes the CI work (maybe)

* Of course CI has a hissy fit

* Actually fixes the codebase

* Oops 1

* Tweaks

* oops
2023-07-18 20:50:31 -05:00
JimKil3
6ad882de48 adds them (#21085) 2023-05-22 22:25:09 +02:00
Venuska1117
b3a5fd773c Fixes (Oversight?) with fungus spawner from #16877 (#21057)
* Changed Fungus
- Now fungus dont spawn wall if roll fails.

* Apply suggestions from code review

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

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-22 22:06:30 +02:00
JimKil3
845c842f14 Renames Strange Reagent to Lazarus Reagent (#20614)
* the great renamining
also changes the description to be more flavorful

* capitalization
2023-03-26 12:04:02 +01:00
Samman166
f915a1d614 Removes smoke cluster grenades (#20331)
* Removes smoke cluster grenades

* removes regular hellwater grenades
2023-02-15 21:17:35 +01:00
Qwertytoforty
e40ef20c86 Pizza bombs can no longer be told apart, some pizza improvements (#20191)
* pizza time

* a batch of delicous pizza fixes mama mia

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

* bool

* Apply suggestions from code review

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

* steels changes

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-02-08 13:07:36 -06:00
Henri215
c4667311e7 Janitorial equipment tweaks and cleaners availability (#20037)
* Janitorial equipment tweaks and advanced cleaner

* cleaner availability tweaks

* old cleaner for drones

* Mop capacity buff

* advanced cleaner for sol traders

* conflict part 1

* Merge branch 'master' into janitorial_tweaks

* Revert "Merge branch 'master' into janitorial_tweaks"

This reverts commit 47129ea819.

* Revert "Revert "Merge branch 'master' into janitorial_tweaks""

This reverts commit a8c520b069.

* hahahahaha

* hahaha part 2

* hahaha part 3

* cerestation edit

* adv cleaner comes with 500 now and ERT belt

* lube spray upper case and moving it to spray.dm
2023-02-03 13:10:51 -06:00
S34N
802408a923 Cere-station [100% free lag edition] (#19951)
* change da world

* compile, thanks

* Update cere.dmm

* Update cere.dmm

* ready for test

* use the proper name please

its CERE not ceres.

* stops shuttle from forcibly docking with podbay

* things are now different

Landmark update for job spawns.
More hardsuits in EVA, engi, and atmos.
Disaster counters properly added.
Vault is now more spooky.
Gamma armoury moved to below gulag shuttle.
Sleeping rooms replaced with arcade and swimming pool.
Captains ERP nest deleted.
Tcomms now looks like it was designed by a functional human being.
Mining doesn't need a weird glass box.
Shuffled docking ports at arrivals.
Windows are now reinforced windows.
Mr changs has arrived.

* disposals functions now

* now with 50% more air

* gamma armoury doesn't attempt to become one with gulag shuttle

* disposals net is airless, vault is enclosed in some rock

* standard number of escape pods

* slight fixes

* more bugfixes

* lighting fixes

* divided hallways, added psych office, more cams

* fire alarms, shutters, and fixes

* temporary DME edit to set cere as default map

* fixed shuttle runtime

* this compiles and runs locally, please CI

* fixes hidden double pipe

* more double pipes

* more vents and scrubbers, morgue body delivery

* tweaks to secbot pathing

* various QoL changes

* Medbay expansion, med+arrival maints expansion.

* the definitive air alarm update, and more!

* Departmental emergency EVA suits, signage, tweaks.

* 2 Cryodorms added (oops). Asteroid sound updates.

* Borg cryo, shutters correctly rotated.

* Supply shuttle edit. I like joining the map queue.

* minor fixes, grav gen isolation.

* minor fixes

* Disposal fixes, lighting adjustment

* SabreML feedback changes

* More minor fixes

* More fixes

* NSS Farragus

* (most) floors turn into asteroid sand, not spess

* reverted random file edit, fixed mr teeny

* minor fixes

* big bombs can breach asteroid areas

* Asteroid plating exists, did you know? I do now!

* camera network pass

* walls become sand too on destruction

* lighting pass

* implements feedback, dramatically reduces ores

* yeets ores entirely, sci break room added

* roundstart pads, more solars, bigger departures

* runtimes

* mining resistant rock

* variable names are important

* AoE KA doesnt affect rocks

* actually fix AoE stuff

* now with 1000% more bats

* no sandy cables, a brig exit chute, more head ssu

* mech drills are not pickaxes

* proc rename, perma window, faster sapce bridges

* Brig rework

* robotics changes

* More sci edits

* Rotayshun changes

* dme edit

* Delete cerestation.dm

begone, thot

* temp edit so it loads cere as default

* merge conflicts begone

* decal purge

* map repipe

* removes under-wall pipe adapters

* shuffled maint areas

* dirt purge

* longest bridge rework

* fixes

* PPI feedback

* kitchen does, in fact, need air

* permabrig tweaks

* restores cc changes

* merge part 2

* tag purge

* secret clown HQ got me shook

* SQUASHENING

* solar shuffle

* directional consoles

* remove TM edits due to rotation

* merge conflict part 2

* pod pilot deletion

* cold rock, window tint fixes, etc.

* further red rocks

* further tweaks

* more standardising

* robotics redo

* carpet time

* CI update for cere

* Apply suggestions from code review

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

* more squash, corridor cam removal, etc.

* light switches

* minor fixes

* temp cere default

* FOODCART!

* fixes

* no airless no more

* space_hall

* compat pass 1

* make it work

* more changes

* slimmening

* air alarm tweak

* TM commit

* ci tests

* final CI changes?

* squash. squeeze, optimise

* wall vent

* disposals fix, more squeezing

* bugfixes

* false walls

* bedroom culling

* edits and fixes

* tweaks

* changes

* det window

* further tweaks

* Revert "TM commit"

This reverts commit 9e8814937f.

* More TM only changes reverted

* fixes smoothing with falsewalls

* denth changes

* the airlockenning

* cicicici

* CICICICI

* further tweaks

* further tweaks

* reverts weird sand behaviour code from ages ago

* oops

* universal adapter my beloathed

* nanomap moment

* webmap

* cere nanomap

* feedback updates

* updates

* airlock tweaks

* vents and tweaks

* solars moment

* triple APC fix

* south of where?

* airlock helpers

* disposal flap purge

* outpost monitor with actual real networks?

* tweakeroni

* fixes

* fixes

* tweaks

* fixes

* medbay improvements

* power and flaps

* changes

* aa changes

* fixes

* more fixeronies

* fixes!

* reversed

* chemicals

* chem tweaks

* fixes

* shuttle fixes

* holopad pass

* editseditsedits

* lightslightslights

* door

* /obj/machinery/computer/security/telescreen/entertainment

* sonic underground

* actual sonic reference

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Tsrc

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-01-17 22:23:09 +00:00
Henri215
b4e970eb90 Added pie cannon and spirit board to Sol Trader items (#20100)
* Added pie cannon and spirit board to Sol Traders items

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

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-13 21:04:11 +01:00
AffectedArc07
1feb9fbd38 [READY] Atmos Refactor Part 7 (I think) - Kills signals + TGUIs stuff (#19867)
* I AM NOT A KING. I AM NOT A GOD. I AM LUNACY.

* THE SCOPE CREEP

* This was done in vi. No langserver. Send help.

* Progress

* Some issues fixed

* The code builds, but the maps dont

* CC builds, I doubt anything else does

* Do this now

* Safety

* The map compiles

* THE MAPPING HELL

* Airlock controllers dont work

* Fixed bombs

* AND THATS FIXED

* Phantom edit

* Restores LL I think

* The mapmerge hooks are actually retarded

* Fixes spawners

* Half working air control

* Picky

* Hyper efficient tank monitor

* Sanity

* Laying the framework

* Improved alert console

* Dont think this is actually done anywhere

* Metering

* ONE HUNDRED AND ~~EIGHTY~~ TWENTY SEVEN

* WE ARE READY FOR BOX TO BUILD

* One map done

* Well that was easy

* Another one

* I think this is done

* I should have removed this

* I would make a russian joke but <current event>

* Delta WIP

* Makes delta work

* Early review

* TM safeguard

* oops

* METAAAAAAAAAAAAAAAAAAAAAAAAA

* Fix #4213

* Trailing

* oh for piss sake

* Shutter fix

* Roundstart ATs can go away

* Review pass 1

* What could go wrong

* BOOM BOOM BOOM

* Not needed

* Fix seed vault

* Oops

* Review changes
2023-01-03 20:59:35 +00:00
Henri215
60958c580d adds wallets to lootdrop (#19691) 2022-11-24 22:43:42 +01:00
S34N
7dcd31990e Ports TCC style windows (#19488)
* window

* fix plasma window and spawners

* this now works well

* Apply suggestions from code review

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>

* Empty-Commit

* Empty-Commit

* colour tweaks

* further colour tweaks

* last tweak

* edges

* false wall sanity

* Update code/__DEFINES/icon_smoothing.dm

* stealth conflict begone

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
2022-11-16 20:44:51 +00:00
Christasmurf
66e893ad2d Adds Suspicious Bomber Jacket (#19545)
* syndicatebomber

* armourmeup

* Update code/modules/clothing/suits/miscellaneous.dm

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-03 18:01:31 +00:00
Contrabang
8b3c043746 cloth addition (#19480) 2022-10-26 00:25:11 +01:00
ElorgRHG
e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
Adri
4943029181 Removes red slime speed potion, replaces it with slime speed treat (#19194) 2022-10-01 15:50:43 +01:00
Contrabang
5e72865320 Mapping indictors for lootdrops are readable now (#19009)
* removes-the-colors

* forgot this
2022-09-12 22:31:40 +01:00
AffectedArc07
34ed47ae74 Refactors stack traces, tiny bit of cleanup (#18773) 2022-08-14 02:11:40 +01:00
Viz
949b73acf2 goodbye noobtrap (#18469) 2022-07-21 14:02:40 +01:00
Sirryan2002
f2813a6730 Complete Library Overhaul Part 1 (#17832)
* first edits

* more commits yay

* more changes

* Update paradise.dme

* changes

* more edits

* more edits

* changes

* more changes

* changes

* more stuff

stuff

Update tgui.bundle.js

* FUCK

* Many UI changes

* Update Lib Computer UI and Correct Map Issues

* squashed commits :)

Guts Old Book/Manual Code and Reworks it
final (almost) touches

* this should pass tests now

* fixes random ruin having a removed object

* adds review suggestions

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

* squashed commits :)

update schema
adds python requested changes
implements proper python & sql scripts
applies some requested changes + minor fixes
bump SQL version to 40

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Apply suggestions from code review

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

* applies requested changes from code review

* lets pass some tests today

more fixes

* Apply suggestions from code review

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

* more requested changes fulfilled

* should fix map issues + a couple other things

* fixes & sanitization stuff

* Apply suggestions from code review

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

* updates UI and implements more requested changes

* mother of bug fixes & UI cleanup

* removes unused code

* Apply suggestions from code review

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

* fixes

* adds GC checks

* Apply suggestions from code review

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

* requested changes + TGUI Cleanup and Styling

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-09 14:55:12 +01:00
KalevTait
89ba9c047c Code Readability - Effects (#18150)
* effects

* removed anchored = TRUE from objects that inherit that property within the effects folder and subfolders
2022-07-02 16:48:46 +01:00
datlo
87be8664d1 Replace maint brown shoes by black shoes (#18125) 2022-06-29 14:38:27 +01:00
Vi3trice
8753e22a8e Rework toy card decks into standard decks (#17925)
* Go fish

* Keep forgetting about the map

* Forgot about the sprites for the double deck

* Cleaned things up

* Fix icon conflict

* Update cards.dm

* Improper tweaks

* Update cards.dm

* Axing the popup from the toy version entirely, that was a little jank

* Meta remap was merged

* Huh. \improper was the issue.

* Update cards.dm

* Few changes and a fix

* More changes

* Update cards.dm

* Update cards.dm

* Update cards.dm

* Merge branch 'master' into go-fish

* Update cards.dm
2022-06-27 22:38:15 +01:00
Bm0n
2f8ca5a845 Adds smoke bombs as maints loot (#18059)
* GRENADE!

* i just realised smoke grenades are far more powerful on paradise

* should be good now
2022-06-26 15:35:46 +01:00
S34N
705578b23b Energy detective revolver (#17771)
* Initial defines

* more work

* icon

* more stuff

* UID not hard ref

* tidying

* overload go brrt

* le sound and dead cell

* delet gap

* initial chargepack stuff

* simplify

* oops

* yeet this

* placeholder sprites

* oops magic number

* the gun speaks!

* consolidation

* tweaking and tidying

* so long old gun

* icon purge

* reapplies placeholder

* 1 minute tracker, not two

* makes it use a pinpointer

* revert tiny map changes

* cease your tracking, fool

* oops

* soft refs

* charlie review

* projectile ref to firing obj, removes testing overrides
& cleans up signals

* some more UID null checks

* ICONS

* ICONS CONFLICT

* MORE ICONS

* makes it freaking work

* first pass fixes

* charlie review

* charlie review 2, variable boogaloo

* fixes holsters

* colours the overcharged shot

* and recolours tracker to be yellow to match charge

* yellow laser icon

* widen overcharge misfire %

* fixes unlinkable pinpointers

* fixes gun not speaking when tcomms setup is changed

* steel request

* no chargey

* loudening 2022

* steel part 1

* Apply suggestions from code review

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

* restores missing sprites

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-25 20:15:09 +01:00
S34N
970675a2c0 Refactors rusted walls and their spawners (#17969)
* refactors rusted walls and their spawners

* tidies this up a bit

* moxian review

* Apply suggestions from code review

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

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

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

* more things

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

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: moxian <moxian@users.noreply.github.com>
2022-06-16 14:47:29 +01:00
Vi3trice
84cb9696f7 Refactor airlock spawner helpers to use access_txt and use cycle_interior/exterior for the door buttons (#17741) 2022-05-10 22:24:39 +09:00
AzuleUtama
0f3133eb25 Fixes certain Nuke Ops bundles using the wrong duffelbag sprite (#17717)
* sprites updated

* removes redundant icon/item states
2022-05-03 04:24:16 +01:00
Vi3trice
b70e4e9f7f Initialize lootdrop spawners and fix Sol trader vehicle spawn to have enough keys (#17586)
* Weeeee

* Right

* They have to call parent anyways
2022-04-12 18:16:26 +01:00