Commit Graph

21040 Commits

Author SHA1 Message Date
Wowzewow (Wezzy)
2e9b367a60 Fixes canned drink inhands (#18431) 2024-02-17 23:35:30 +00:00
tomixcomics
3850d6c52f New food as well as updating lasagnas and pancakes (#18412)
* added a bunch of things

* updated pancakes

* more updates

* updated bounty, made changelog
2024-02-17 20:06:30 +00:00
Werner
fbe4dc5921 Revert "Event/Away Site Sprite Spring Cleaning (#18318)" (#18435)
This reverts commit 320c482f51.
2024-02-17 11:32:51 +00:00
kyres1
8fd19de25c Nugget 4x Multiplication (#18409)
* mcdonalds

* thats not very mcnuggets of you
2024-02-17 00:07:18 +00:00
TheStryker
cc9b28932c Resprites the Konyang police lieutenant outfit. (#18408)
* Replaces konyang police lieutenant outfit.

* Adds police vest

* adds konyang police vest to the code

* adds changelog
2024-02-16 18:46:09 +00:00
DreamySkrell
713c5d1448 k'ois MRE (#18361)
* m

* ahret

* 3

* tests rerun please

* spr

* 234twfegsdv

* tests rerun please

---------

Co-authored-by: DreamySkrell <>
2024-02-16 11:49:41 +00:00
Wowzewow (Wezzy)
320c482f51 Event/Away Site Sprite Spring Cleaning (#18318)
* Event/Away Site Sprite Spring Cleaning

* whoops

* fixes

* news

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

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

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

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

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

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

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

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

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

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* prop hunt

* Gamers

* merge conflict again

* really

* signs

---------

Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2024-02-16 11:16:22 +00:00
kyres1
0fd255a440 Point Verdant last minute bugfixes (chapter 1) (#18403)
* breaks your kneecaps cutely

* AGREGRHRH

* matt is a DUMB

* wait this was already fixed wtf

* buffet trays and the cave biome
2024-02-16 02:57:34 +00:00
Fluffy
7b00d35a77 asdfa (#18422) 2024-02-16 01:42:03 +00:00
DreamySkrell
14e6b320ae Fixes all ghost spawners being visible always (#18423)
* 354yerhdfbnv c

* h

* rehg

---------

Co-authored-by: DreamySkrell <>
2024-02-15 22:16:27 +00:00
Ben
35c5254e4e Law Manager Fix (#18421)
* Changelog

* Bugfix

* Random documentation update

* fix indent

* deathsquid

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
2024-02-15 18:52:29 +00:00
Ben
d2e5562116 Adds new Golden Deep Ornate Energy Pistol and gives it to Consular (#18343)
* Code for da gun & changelog

* less crazy

* Adjust

* fix + temp projectile

* fix

* Golden deep suit and caps to effects

* noise

* Sprites and LORE

* nerf

* forgot cap

* Dizzy

* Forgot to renable eyeblur, should be final change

* changes

* disabler projectile

* Suggested Changes

* Requested Changes

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
2024-02-15 17:32:57 +00:00
Fluffy
ebbe79d457 Ruins UT should not randomly allow broken ruins to pass the test anymore (#18406)
* sdfa

* pain

* hb

* sdaf

* hjkb

* fsda

* sdaf

* sdfa

* dfg

* safd

* gdfg

* sadfas

* even in death we serve the omnissiah

* asdf

* sfad

* sadf
2024-02-15 16:21:22 +00:00
feartheblackout
a4ef8bce8a Reduces cost of Journalism app to 2 GQ (#18401) 2024-02-15 11:27:25 +00:00
DreamySkrell
b251af5b7b Ghost spawner UI improvements (#18398)
* 4yehdgfjh45uhjt

* 342twgrse

* 5euyhtd

---------

Co-authored-by: DreamySkrell <>
2024-02-15 11:27:22 +00:00
RustingWithYou
87e24c9ffb Revert "Swaps out the Hegemony consular's pistol for the Kataphract esword" (#18397)
* Revert "a big bear (#18369)"

This reverts commit 5b377c436d.

* changelog
2024-02-14 20:42:39 +00:00
Fluffy
704384e045 dsff (#18394) 2024-02-14 01:27:15 +00:00
DreamySkrell
81e7565431 Survey Probe (#18359)
* s

* cc

* hhh

* generate_survey_result -> generate_ground_survey_result

* hhh4

* h64

* htr

* 3

* tt

* 4

* c

* h

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

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

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

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

* review

* 5thng

* 54yhtgn

---------

Signed-off-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
Co-authored-by: DreamySkrell <>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2024-02-13 20:48:50 +00:00
kyres1
9b55720b0a Waaaw (#18388) 2024-02-13 11:16:55 +00:00
RustingWithYou
d8d7bf5251 the fire rises (#18391) 2024-02-13 11:16:37 +00:00
Fluffy
9afe761db3 Some refactors, DMDoc and UT (#18365)
* dsfa

* accessories fix

* fixed "has been hit by" message with intent check

* sdfa
2024-02-12 15:32:23 +00:00
feartheblackout
26fe8f28fc Removes Pleig's custom item (#18378) 2024-02-12 11:12:26 +00:00
Sniblet
768e95c1ea the pr (#18382) 2024-02-12 11:12:16 +00:00
Matt Atlas
4423d03f2f Adds examine boxes. (#18370)
* Adds examine boxes.

* lint

* what kind of dreams did you dream?

* unlimited

* midgardsormr

* sdsd

* fixes

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-02-11 21:58:20 +00:00
Llywelwyn
7f1db2d6ac Makes journals recolourable, and adds them to the loadout so they're accessible to anyone (#18366)
* adds journal to loadout

* cuts apart journal into overlays + bases

* swaps out full sprites for bases + uncoloured overlays (the paper)

* makes sprite white ready for recolouring

* default journal colour

* changelog

* sprites to library.dmi

* downsizes the journal (no longer bigger than a house)
2024-02-11 18:54:55 +00:00
smellie
2deb8e2783 AI Shell Toolset Additions (#18367)
* ai toolset additions

* i stupid
2024-02-11 18:54:53 +00:00
HanSolo1519
c8c1c2e62f Adds Dissolvable Cleaner Tablets (#18316)
* Update pill.dm

* Update pill.dm

* Update pill.dm

* Update boxes.dm

* Update boxes.dm

* Add files via upload

* Add files via upload

* Update pill.dm

* Update boxes.dm

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

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

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

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

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update boxes.dm

* Update pill.dm

* Delete icons/obj/cleanertablet.dmi

* Delete icons/obj/tabletcase.dmi

* Update service.dm

* Update loot.dm

* Update loot.dm

* Update pill.dm

* Adds changelog

---------

Signed-off-by: HanSolo1519 <72716882+HanSolo1519@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-02-11 18:54:37 +00:00
Llywelwyn
5b377c436d a big bear (#18369) 2024-02-11 14:47:56 +00:00
kyres1
99ad713e25 Mostly finishes Point Verdant + abandoned biome (#18197)
* testicle torsion

* fish

* fixes compile

* fin

* dreamy suggestion

* fixes conflicts and adds rustings stuff

* matt thing

* what the matt doin

* fixing airlock ids

* landing zone areas fix

* readding grates

* FUCK

* removing closed air spaces in the garage ruin
2024-02-10 10:01:56 +00:00
DreamySkrell
d54addff98 s5hrth (#18358)
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: DreamySkrell <>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2024-02-09 12:20:26 +00:00
RustingWithYou
1506f1a50d Departmental Event Jobs (#18245)
* event jobs: the test of faith

no horizon spawns

engineering name fix

* event jobs 2: they work now
2024-02-09 12:18:15 +00:00
Greenjoe12345
b5b3389252 commissary (#18329)
* commissary

* air alarm

* windows

* more work
2024-02-09 12:16:38 +00:00
feartheblackout
74e1c0b073 Improves expression mask sprites; adds Unathi mask (#18331) 2024-02-08 15:03:17 +00:00
Matt Atlas
b44e3554bd Fixes an exoplanet runtime. (#18372)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-02-08 15:02:24 +00:00
RustingWithYou
a2dc88c303 bug consular guns (#18345) 2024-02-08 14:21:13 +00:00
Fluffy
849340274d sdaf (#18321) 2024-02-08 12:38:28 +00:00
tomixcomics
f05a932212 Adds new foods, fixed food bug and 1 food tweak (#18356)
* created a PR

with a whole buncha stuff :D

* Update recipes_breads.dm
2024-02-08 12:30:19 +00:00
Fluffy
25dc248979 Updated statpanel and added client pings (#18337)
* SSatlas.current_map

* hardsuit spell tab appears to clear correctly

* sdfsa

* from the moment i understood the weakness of my flesh, it disgusted me

* sdf
2024-02-08 12:29:42 +00:00
Fluffy
f481143eb4 Operating Tables Refactor (#18340)
* sadf

* sdf

* adeste fideles

* sadf
2024-02-08 12:08:09 +00:00
Fluffy
a63c409241 sdafasdf (#18351) 2024-02-08 12:06:46 +00:00
DreamySkrell
fd4f05a694 Abandoned Propellant Depot (#17825)
* a

* a

* x

* propellant

* aa

* a

* k

* y

* 54

* 57

* wires and pipes 😩

* a

* 978

* 8641

* 5484685648956795679467

* aalarms

* areas

* 7595768957957

* a

* a

* yyyyyyyyyyyyyyyyyyy

* 55555555555555555

* aaaaaaaaaaaaa

* 3

* h

* 1

* a

* 426246247

* 1356

* 7452

* 73

* bbbbbbbbbbbbb

* hh432y35aye

* 4362623757346

* cc

* h568sr5tu

* 4

* b

* tests rerun please

---------

Co-authored-by: DreamySkrell <>
2024-02-07 16:46:39 +00:00
RustingWithYou
e7fd40d18d Konyang: The Haneunim System (#18075)
* it begins.

* more away sites for the road

* yeah

* refugee shuttle

* ghghhg

* ok ok ok ok

* consistent ghostrole costs

* changelog

* ghgh

* Update code/modules/maps/planet_types/lore/konyang.dm

Co-authored-by: Geeves <ggrobler447@gmail.com>
Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>

* Update code/modules/maps/planet_types/lore/konyang.dm

Co-authored-by: Geeves <ggrobler447@gmail.com>
Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>

* addresses requested changes

* geeves changes

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Co-authored-by: Geeves <ggrobler447@gmail.com>
2024-02-05 20:23:57 +00:00
DreamySkrell
4fbd03bcd6 Private yacht (#18211)
* hmmm

* 8

* 56789

* 9

* a

* :)

* k

* o

* a

* 768

* h

* 5

* j

* h

* 4

* 12

* 9r

* gg

* qqqqqq

* hmm

* 8

* r

* ddddd

* 6

* tryjsrtjs45rujhrtfd

* trfjtrdxjs456 uya45 rst hrstyj

* o

* idk

* l

* a

* e

* 315

* cc

* q

---------

Co-authored-by: DreamySkrell <>
2024-02-05 20:23:16 +00:00
Sniblet
4ad2d7feaf the pr (#18322) 2024-02-05 20:22:50 +00:00
Ben
8ac9767f6a TCAF Sprite Update (#18336)
* New Sprites

* Adds chest gear 4 TCAF

* Xeno friendly TCAF helmets added to uplink crates

* TCAF uplink cost fix

* chest gear added

* tcaf light armor plates added to uplink

* forgot to remove

* the

* TCAF Gloves

* bugfixes

* Changelog

* toeless jackboots

* changelog

* log

* Update html/changelogs/Ben10083 - TCAF_Sprites.yml

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>

---------

Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2024-02-05 20:22:40 +00:00
Hazel
e7762be55f Prevents ghosts from calling elevators (#18334)
* Prevents ghosts from calling elevators.

* Added a changelog.

* Checking if comment spacing is improper.

* Removed space indentations.

* Allows admin ghosts to call the lift.

* Update code/modules/turbolift/turbolift_console.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Hazel <83198434+hazelrat@users.noreply.github.com>

* Update code/modules/turbolift/turbolift_console.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Hazel <83198434+hazelrat@users.noreply.github.com>

* Update code/modules/turbolift/turbolift_console.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
Signed-off-by: Hazel <83198434+hazelrat@users.noreply.github.com>

---------

Signed-off-by: Hazel <83198434+hazelrat@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2024-02-05 20:22:34 +00:00
Llywelwyn
97752b1a79 Fixes health scanner augment, so it doesn't visibly message, and can no longer "hit the floor" if dizzy (#18357)
* enables var/just_scan on aug healthscanner

* cl
2024-02-05 20:22:18 +00:00
RustingWithYou
7cfa32e40f tret card bugfix (#18346) 2024-02-05 20:22:06 +00:00
RustingWithYou
a16fce4b71 Konyang: The Infected (#18301)
* ipc zombies

punch sounds & corpses

jungle map & icon fix

sounds

zombie village

glowing screen: you should kill yourself, now

light

ship 1

da wreck

infected outpost

ok ok ok

globs & templates

* changelog

* Update code/modules/mob/living/simple_animal/hostile/ipc_zombie.dm

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

* Update code/modules/mob/living/simple_animal/hostile/ipc_zombie.dm

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

* dmdoc & parent call

* unspeakable its patterns laid

* yeah

* glob

* Update code/modules/mob/living/silicon/robot/items/robot_tools.dm

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

* Update code/modules/mob/living/silicon/robot/items/robot_tools.dm

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

* Update code/modules/mob/living/simple_animal/hostile/ipc_zombie.dm

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

* Update code/modules/mob/living/silicon/robot/items/robot_tools.dm

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

* dmdoc

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2024-02-03 00:18:05 +00:00
DreamySkrell
e99b793647 Crystal Planet Outpost (#18308)
* a

* 3

* m

* 754

* hm

* 1234

* hh

* hmmmm

* 4262643

* 4663

* 43gf34g

* aaa

* huhhh???

* 54hg56u456s

* bbvxnfgnhrst

* h

* hj

* mmmmm

* cc

* 436y

* ugh

* aaaaaaaaaaa

* hhh5555555

* reyahg5reha54eh5raethre

* tests rerun please

* a

---------

Co-authored-by: DreamySkrell <>
2024-02-01 11:04:05 +00:00