Commit Graph

10419 Commits

Author SHA1 Message Date
Bakaface
41f6620c2a Adds cheese to the cheese (#23218) 2023-11-12 09:18:06 -06:00
Contrabang
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
Daniel Lenrd
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
Adrer
400661b5cc Fixes overlay issues. (#23186)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-07 11:14:03 +01: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
Migratingcocofruit
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
SchrodingersWolf
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
Bjamcham
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
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
Bakaface
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
Adrer
87f0337b45 Adds camera bug camera network to restricted_camera_networks (#23135)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-03 21:16:28 +00:00
ppi13
abe4110704 Turns isholy into a trait and adds a trait mind helper (#23107)
* Converts isHoly into a trait

* Moves holy from body to mind

* Uncurses the source of curses

* Updates source to roundstart trait

* Contrabang fixes

* Forgot one

* Add trait mind helper

* Request changed Dgamerr/Contra

* Fixes issue

* Nullchecks minds
2023-11-03 20:07:20 +00:00
Adrer
aa7ea39f48 Morgue tray now updates properly (#23109)
* Morgue tray now updates properly

* Return of the guard clause

* Send signal upon ghosting/reentering

* Correct source for reenter corpse signal

* Signals split up, now works with DNR

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-03 19:22:47 +00:00
Adrer
2bf4617f0b Changes darkblessing inhand file to proper one (#23133)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-02 21:33:27 -04:00
Bjamcham
d8bb2c028b Handheld mirror buff zoooooom (#22967) 2023-11-01 20:12:26 +00:00
Qwertytoforty
357c62b6d7 Ports hitscan from TG, adds it to *SELECT* things (#22754)
* this was just going to be a plasma cutter change but no had to make it look good, whats next, ai sat turrets (yes)

* ai turret

* Coca cola, don't forget the ice. Or the pulse

* almost done, pull master than map edit

* we ball

* ah, chasms.

* it's for the best. Fuck should not sleep checker though

* hitscan reflection limiting system

* Apply suggestions from code review

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

* c-c-c-changes

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-11-01 20:05:27 +00:00
Luc
95d3a49929 Ports Malf AI rolling (and some other tipping refactors) (#21900)
* some thoughts

* I really forgot to commit all of this didn't I

* Rework vendor crits

* fixes some angle jank

* yeag

* Patches up most bugs with tilting things over

* Fixes up most of the AI logic

* rolling AI can now take teleporters, visual effect is now only seen by the AI

* better effects

* Remove a bunch of now useless code

* I keep forgetting this

* cleanup in aisle seven

* oops

* some more testing

* adminbus hours

* Fixes some buildmode stuff, does some more testing

* Add documentation

* Demo bugs

* Apply suggestions from code review

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

* rework crit damage amount

* Adapt recent tg changes

* Fix some small bugs in testing, contra review 1

* contra review 2

* Fixes tipping with pacifism

* restore removed icons

* Fix some remote untipping

* restore the roll action

* finally address contra's review (sorry)

* remove debug tool

* Move untilt logic into component

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-31 20:24:52 +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
S34N
49b0071400 Repaths some decals, makes copyTurf copy decals (#22528)
* why do I do this to myself

* pass 2

* maps

* delete this

* PR number obtained

* Revert "maps"

This reverts commit 87926f4a0c.

* maps
2023-10-30 20:15:14 +01:00
warriorstar-orion
7835ff6de4 Apply living checks to dispenser stations. (#23034) 2023-10-30 19:11:20 +00:00
GDN
9dc884207f fixes mail not working sometimes (#23024) 2023-10-30 19:10:59 +00:00
DGamerL
cb511ae725 Fixes it all, I hate it (#23008) 2023-10-30 19:10:39 +00:00
Luc
30c6a59d63 Improve readability of health scanners (#22905)
* improves medscanner output

* remove comment block

* update colors with dark/light mode css

* Update goon/browserassets/css/browserOutput.css

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-30 19:07:00 +00:00
Farie82
2d23ee4aaa Fix prayer breads (#23056) 2023-10-30 19:03:47 +00:00
Henri215
de50855e45 TG port: New display, pod control and request console sprites (#22979)
* TG port: New display, pod control and
request console sprites

* fixing pod control sprite animation speed
2023-10-29 20:55:39 +00:00
BiancaWilkson
4ac6435015 cheeseless cheese (#23047) 2023-10-29 21:06:42 +01:00
1080pCat
5f38561464 Janitorial ERT rekit/buff and a few additions for the jani ert squad. (#22913)
* jani ert buffs yummy

* yipiee

* beh

* Bruzah and DGL review

* Update ert_outfits.dm
2023-10-29 10:19:08 +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
Bakaface
b3c5fa6493 Fixes the typo in the appearance list (#23049) 2023-10-29 10:16:02 +00:00
Bjamcham
81a1105d74 I feel like I'm missing something (#23062) 2023-10-29 10:15:36 +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
BiancaWilkson
115ab60f72 Adds a syndicate soap upgrade for janitor borgs (#23033)
* red

* whitespace fix

* i love being literate

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-27 20:20:27 +01:00
Christasmurf
eed4890be5 white beret (#23013) 2023-10-27 20:19:45 +01:00
Henri215
7ddf9c4250 Extinguisher cabinet resprite (#23003)
* lets put out this fire

* lets paint it red

* adjusting the code

* Extinguisher cabinet resprite
2023-10-27 20:18:59 +01:00
ppi13
16da484b49 You can now altclick lockboxes to open them (#22957)
* You can now altclick lockboxes to open them

* Contra feedback - Add early return of adjacent

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

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

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

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-27 20:18:14 +01:00
Daniel Lenrd
2f173c48c2 Added extra items to RD garment bag (#22916)
* Added Extra Cloth

* added SRC to beret

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

* Empty-Commit

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-10-26 10:42:10 +01:00
Qwertytoforty
7db1d5b63d Bluespace vetus doesn't spark from it's anomalies (#23001)
* hardmode vetus now puts out less sparks than the fourth of july

* Update code/datums/helper_datums/teleport.dm

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-10-26 10:41:22 +01:00
Mitchs98
fc8f214b22 Buffs Cult Door Damage Reflection to 20. Ups Runed Metal cost to 3 (#22978)
* buff door

* extra buff
2023-10-26 10:39:49 +01:00
DGamerL
1172e48b43 WHY OLDCODERS WHY (#22975) 2023-10-26 10:39:26 +01:00
Vi3trice
85353104f7 text be gone (#22929) 2023-10-26 10:39:11 +01:00
Henri215
a1206bbd89 Gives engicart a radial menu (#22922)
* Gives engicart a radial menu

* correct names

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-10-26 10:36:30 +01:00
Burzah
0e455176b2 Adds additional logging for megaphone (#22949)
* Adds additional logging for megaphone use

* format change

* Formatting change to log_say (review change)

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

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-22 12:07:34 -04:00
DGamerL
840161bc67 Makes meteors not take damage from railings (#22909)
* One simple istype killing many Farragi

* Qwerty Suggestion
2023-10-22 12:07:21 -04:00
Sadhorizon
d3ea6b2620 Remaps the Lavaland Outpost. Again. (#22391)
* a remap begins...

* tweaks

* bye-bye, QM's handheld crew monitor

* brings back the abandoned crate

* oop

* more tweaks

* tcomm pipes

* brad update

* more firelocks

* more windows

* tweaks

* denth review part 1

* renaming doors

* crowbars

* changes walls, new locker

* Oyu's review

* more tweaks

* signs

* MAYBE will be deconflicted

* now deconfllicted hopefully

* some more tweaks

* no more wall helpers!

* fluff

* IDs for polarized windows

* slight tweaks to firelocks

* added grilles

* more tweaks

* tiny lil maint update

* more maint tweaks

* maint rework part 3

* oopsie

* jani has dark floors now

* reworked robotics, gave brad more love

* stationary defibs

* stuff

* bug fix

* more tweaks

* aaaaa

* Revert "aaaaa"

This reverts commit f70ba3a89a.

* more tweaks

* fixed scrubbers, tweaks

* should compile

* reshuffles maint loot

* request consoles + tweaks

* more tweaks

* access helper tweaks

* very minor access tweaks

* you can now pet Brad

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

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

* renames access

* shuttle decorations + other tweaks

* oopsie

* bjam's reviews

* split the QM's locker
Exa's approval, rest of design team did not share opinions

* OH UH

* this too

* this is a better way to do it actually

* sean review + floodlight subtype

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-21 21:30:28 +01:00
Luc
046e5ced8d Transit tube hotfixes (#22944)
* hotfixes

* removes dated comment
2023-10-20 20:15:09 +01:00
HMBGERDO
aa33cb211a Abstract items can be shown (#22183)
* abstract weapons can be shown

* customised messages, no force visible flag

* forgot this

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

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

* return nothing if we want to return nothing

* vortex arm abstract text

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

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

* \n moved to examine code

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-10-20 19:58:51 +01:00
Bjamcham
83be35a3ea The curse of inhand.dmi (#22962) 2023-10-19 12:31:32 -05:00
Farie82
074959da06 Respect the inventory (#22941) 2023-10-17 15:02:15 -05:00
Adrer
d5af86dee4 Updated HOP and QM cartridge and added new supply cartridge. (#22464)
* Updated HOP and QM cartridge and mapped instances

* Updated descriptions and apps

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-10-17 20:12:36 +01:00
Farie82
9da71e19c5 Ensure removing an implant actually calls remove on actions instead of grant... bruh please (#22940) 2023-10-17 13:53:20 -05:00