Commit Graph

21674 Commits

Author SHA1 Message Date
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
Qwertytoforty
8a941bae66 fixes tabbing in nanny bag (#22708) 2023-10-04 20:59:59 -05:00
Burzah
73906ecc96 chem bio-chip logging (#22649) 2023-10-03 22:04:31 +02:00
GDN
f85f3ff252 fixes a tochat runtime (#22673) 2023-10-03 22:04:16 +02:00
biogod420
d374be622d added comments (#22662) 2023-10-03 13:29:45 -04:00
Contrabang
f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297)
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
2023-10-03 18:27:51 +01:00
DGamerL
a6a34c2592 Never thought I'd be fixing a nukie stealth nerf (#22695) 2023-10-03 17:52:31 +01:00
DGamerL
0fae71b79b Seems to fix it (#22680) 2023-10-03 17:48:13 +01:00
warriorstar-orion
3a1f827041 fix runtimes setting empty crayon message (#22672) 2023-10-03 17:44:50 +01:00
DGamerL
3d116fc516 Fixes cult ghosts not being able to be summoned anymore (#22665)
* Should be the fix

* Yes, the debug messages still exist, I know

* No more debug messages

* Logic fix
2023-10-03 17:44:22 +01:00
ZERO-XZB
2b9ca38824 Bug fix for carrot shivs Fixes #22556 (#22627)
* carrot_progress

* more carrot testing

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* Bugfix for #22556

* Bug fix regarding carrot shivs (#22556)

* Update code/modules/hydroponics/grown/root.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* testing item.dmi fix

* hopeful items.dmi fix

* Update code/modules/hydroponics/grown/root.dm

Adds Contrabang's suggested parens.

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

---------

Co-authored-by: ZERO-XZB <temp@temp.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-03 17:40:02 +01:00
Adrer
1b4573cdf7 Adds supply department to agent ID options and cleans code (#22613)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-10-03 17:16:03 +01:00
Qwertytoforty
73df3fcf14 Antimatter now innacurate without zooming. Sniper projectiles are faster / pass through weak stuff. (#22506)
* I should port the sniper rifle bot from blood blockade battlefront

* fuck that a

* Apply suggestions from code review

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

* variable on bullet

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-03 17:10:55 +01:00
Octus
1fc452cef8 Makes the Librarian a little less shit, now they know most languages. (#22460)
* less shit

* adds some restrictions, handles Matt's request

* fix

* Update code/modules/mob/language.dm

Co-authored-by: Daniel Lenrd <mr.lenrd@mail.ru>

* Update code/game/jobs/job/support.dm

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

---------

Co-authored-by: Daniel Lenrd <mr.lenrd@mail.ru>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-03 17:08:54 +01:00
Adrer
2672d02eb3 [s] Martial arts granted by equipped items no longer persist through cloning. (#22684)
* Martial arts no longer persist through cloning

* Remove unnessecary var declarations

* Combo counter

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2023-10-03 08:47:19 +02:00
DGamerL
53c3e893c2 Fixes Crutches not working properly (#22660)
* Yippeee

* Proper order

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Apply suggestions from code review

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

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

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

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-01 16:38:36 +01:00
Adrer
61c601ddba Requires_tcomms now actually works when tcomms are down (#22402)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-10-01 14:18:07 +01:00
Contrabang
7e0aa47311 Refactors objectives, expands team functionality, and custom teams (#22374)
* step 1

* renaming 1

* how could I forget this

* renaming 2

* renaming 3

* add matching proc, even if unused can remove later

* rename team obj to match

* oops

* okay more stuff

* okay more stuff

* fix this stuff

* okay more stuff

* needs_target = FALSE

* OKAY MORE STUFF

* OOPS AGAIN.

* self-review

* more round_end stuff

* stuff 119

* yeah fix that too

* EVEN MORE CHANGES

* grammar

* fix

* s34n review

* fixes custom teams with no antags not showing objs

* makes objectives work properly with teams

* a
2023-10-01 14:14:10 +01:00
DGamerL
0b31343cd1 Refactors the surplus crate (#22367)
* WOOOO

* We do this now

* This too

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Hmmmm not quite there

* One push

* Aight we ball

* Whoops I gotta run

* WE ARE SO BACK

* Forgor

* Now with even more Cl passing!

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Apply suggestions from code review

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

* Contra review

* Moving it to crates.dm

* Lewc Review

* Forgot about this

* Fixes contractors

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/game/objects/structures/crates_lockers/crates.dm

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

* Uh oh they are giving out too much

* Fixed TC refund

* Whoops

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Lewc review

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-01 12:58:49 +01:00
Octus
2bdd9397aa Removes Pet Hospital, Adds Althland Corporation Refinery Ruins (#22287)
* byebyepet

* typo fix

* more typo fixes

* fixes

* another fix

* delete hospital shit

* ok seriously work now you fuc-

* improvements

* changes tempature

* heat proof lattice

* hi qwerty

* test

* ok lmao

* lattice moment

* oopsie!

* ok fuck you

* map update

* yes

* Revert "yes"

This reverts commit 9892a11232.

* Update lavaland_surface_althland_facility.dmm

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

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

* henri review

* adds lore

* fix

* fix

* more fix

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-01 12:24:43 +01:00
Sadhorizon
dfd13270e9 Adds a new fauna to lavaland: an abandoned minebot! (#22173)
* added the file

* works pretty nicely

* forgot these comments

* doubled their spawn chance

* minebot passthrough stuff

* more fluff

* no longer will go to lava tiles

* answered most reviews

* DGL's solution

* makes loot more efficient, minor tweaks
big thanks to DGamer with this one!

* DGL's review

* Update code/modules/mob/living/simple_animal/hostile/mining/abandoned_minebot.dm

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

* Merge remote-tracking branch 'upstream/master' into outpost_remap_copy

* oops, a lil fuckup

* removes an unneeded var

* removed the landmark iconstate

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-10-01 12:12:11 +01:00
Henri215
85d8aeee96 Nt recruiter First DLC (emag and other tweaks) (#22427)
* New NT Recruiter update

* Adding emag effect for the arcade + other tweaks

* tickets for reward too

* ops

* Medal prize!

* adding sounds when losing!

* increasing minimum bad max age

* added small interaction cooldown

* adjusting time

* tgui rebuild

* ah shit, here we go again

* tgui rebuild

* lets fix this

* Apply suggestions from code review

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

* tgui rebuild

* tgui rebuild

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-10-01 11:49:24 +01:00
DGamerL
4c976a6e01 Splits up item_inhands.dmi (#22584)
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes jackhammer and glass shard

* Fixes toy Chainsaw

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

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

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

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

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

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

* Fixes edagger hopefully

* Henri review

* Oops

* First this gone, and now the pain

* Should all be fixed now

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-01 11:47:25 +01:00
Luc
e757638648 Kills Check Pulse (#22501)
* unchecks verbs

* removes method
2023-10-01 11:41:39 +01:00
warriorstar-orion
f8d195f0b7 add crayon message customizer; port TG alphanumeric crayon decals (#22499)
* guh

* add crayon message customizer; port TG alphanumeric crayon decals

* docs
2023-09-30 08:41:42 -04:00
Contrabang
b66b717681 fuck (#22574) 2023-09-30 08:38:22 -04:00
meow20
f3a5ef74ca Fixes runtime when clicking an empty coat hanger with empty hand. (#22577)
* prevents runtime if the hanger is clicked when its empty

* changes recommended on code chat

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-30 08:38:14 -04:00
meow20
fb1fd1261b Prevents alien resin from growing over chasms/lava (#22589)
* the actual fix commit

* Update aliens.dm
2023-09-30 08:25:57 -04:00
Contrabang
c14de908f9 Fixes borgs not being able to build over chasms (#22599)
* snowflake check

* almost forgot
2023-09-28 19:34:06 -04:00
DGamerL
10c1c82c09 We using traits in this house (#22548) 2023-09-28 19:32:57 -04:00
matttheficus
5e914948b2 Logs Toy Cuffs/Twimsts Differently from Standard Cuffs (#22542)
* god i cant believe we have to do this

* im a silly goose

* K.I.S.S.

* better wording
2023-09-28 19:32:26 -04:00
Adrer
09471429dd Ascended spirit no longer can be summoned as a cult ghost. (#22540)
* Ascended spirit no longer can be summoned as a cult ghost

* Update code/game/gamemodes/cult/runes.dm

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

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-28 19:31:58 -04:00
Henri215
9d10226da2 Adds a new crutch mechanic (#22527)
* hidden compartment

* adjusting text

* NODROP

* Contra review
2023-09-28 19:31:32 -04:00
1080pCat
416f4580f0 Moves charcoal out from under the contraband wire in nanomeds(the wall ones) (#22329)
* charcoal? contraband??

* guh

* fixes gatto ass sorting

* i conflicted myself!

* gawd damn it
2023-09-28 19:31:09 -04:00
DGamerL
3683abf02b [s] Last one? Last one. (Probably not) (#22616)
* Should fix it

* ???

* Test another time

* tEST3

* All done!
2023-09-27 15:42:43 -05:00
Fordoxia
cc76b29ff0 Cyborg Upgrade Typo Fix (#22554)
Fixes some typos and slightly rewords some flavour text for cyborg upgrade modules.
2023-09-25 19:19:17 -04:00
Contrabang
23c4e49eed [TGUI] Wall safes/secure briefcases (#22447)
* bam

* fix this

* fix

* thing

* prettier

* tgui

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

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

* guh

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-25 19:19:07 -04:00
Qwertytoforty
98f15e80a2 Remakes a pr I already merged because github is fucked (#22547) 2023-09-25 19:09:23 -04:00
DGamerL
ed11dad321 Buffs Nuclear Operative Cyborgs (#22444)
* Pinpointer + grenade launcher

* NANOPASTE FOR THE PEASANTS

* Adds pinpointers lmao

* Removes the Nuke

* Henri review

* Update code/game/gamemodes/nuclear/pinpointer.dm

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

* Henri review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-25 19:05:15 -04:00
Contrabang
59c70f983b Heads/sec/legal can no longer join after revolutionaries have won + Refactor (#22328)
* THE THIRD REV PR

* 2nd time

* final changes

* yea

* fixes

* comments

* oops

* sirryan review

* Update code/game/jobs/job/support.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-25 19:03:25 -04:00
SchrodingersWolf
cd85b9ba33 The Skill Level is now sk_baby - Nerfs Bloodcrawl (#22397)
* /mob/living/simple_animal/demon/slaughter

* Tuning down skill level to 'I'm too young to die'

* We call this a DIFFICULTY TWEAK

* All demons get to join the fun too (Except Shadow)

* Cooldown is reduced to 1 second per request
2023-09-25 18:59:28 -04:00
warriorstar-orion
ad5e71c9da add blackbox stats for mail scans/deliveries (#22508) 2023-09-23 22:53:43 -05:00
DGamerL
d4a72d4835 Yes (#22495) 2023-09-23 19:39:29 -05:00
Burzah
56a041e274 Cult deconversion logging for admin logs (#22493)
* logs for deconversion

* KISS
2023-09-23 19:36:45 -05:00
Adri
5b10076243 [s] Fixes an infinite sand/ORM exploit with grass tiles and shovels (#22525)
* Fixes an infinite sand exploit with grass tiles

* Readds shovel functionality

---------

Co-authored-by: Miraviel <Miraviel@users.noreply.github.com>
2023-09-21 15:00:42 +01:00
Henri215
0836c7ff0e Tweaks to Orion and Battle arcades ticket amounts (#22435)
* reward tweaks

* rand amount of prize

* no more random

* even more tweaks
2023-09-20 20:22:45 -04:00
GDN
f13586300f pulse demon reopened PR (#21969)
* proof-of-concept implementation

* clear being_hijacked on death

* it glows in the dark

* oops

* machinery interactions and some fixes

* consistency, correctness, fixes

* stop usage of the \the text macro

* list inits in Initialize

* fix control flow spacing

* review compliance

* event code and some tweaks

* upgradable spell abilities and some tweaks

* how did that happen

* cycle cameras spell

* stat upgrades (no sprites for now)

* tweaking

* sounds

* jecties code

* more tweaks and fixes

* some review stuff

* alt-click user param and charger icon fix

* Remove unused default amounts in objectives

* Comply with sirryan review (part 1)

* Move isapc definition

* Add autodoc comments to all pulse_demon vars

* Give random number in name on init

* Fix merge conflicts

* Remove pulse demon from traitors on Destroy

* Fix mulebot relaymove override

* Fix airlock TGUI actions

* Fix loop over mobs in cablehop

* Attempt to fix overload runtime

* Half-fix gun cooldown issue

* Fix chat related issues

* Attempt to fix overload runtime (take 2)

* Make ion projectiles collide

* Tweak pulse demon speed

* Make demon survive loc being deleted

* Send message when saved by self-sustaining

* Fix vv_edit_var for charge

* Stop people disabling hijacked bots

* Make demon lose more health when not on wires

* Increase costs of stat upgrades

* Allow demon to change its drain speed

* Stop demon obliterating xenos

* Comply with review (partial)

* Fix issues pointed out in reviews

* Allow demon to drain charge of reachable items

* Adjust volume of demon sounds

* Improve cell interactions

* Bump up event weight (for testmerge)

* Give pulse demon a highlight section on orbit menu

* Give demon an experimental soft-counter to insuls

* Reduce volume of most common sounds (again)

* Update demon cable overlay when required

* Stop AI using its tracking ability on pulse demons

* Add wizard spawner for pulse demon

* Tweak EMP behaviour and numbers

* Clear references in Destroy

* Make appear on end of round credits even when dead

* Prevent pulse demon from detonating cyborgs

* Generalise insulated structure check

* Clean up remaining review requests

* Add new sprites

* some addressed reviews

* Typepath changes, GC fixes

* I blame charlie

* good enough

* die or something

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm

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

* even more changes

* final tweaks

* what

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* bam

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

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

* to_chatn't

* deconflicted

---------

Co-authored-by: unknownuser782 <126365777+unknownuser782@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-20 16:25:13 +01:00
McRamon
7cd7102663 Deliveryboy (#22185)
* sprites

* code1

* test

* more code and testings done

* i am loosing it

* if only i didnt make stupid mistakes

* good boy can be delivery boy

* Update code/modules/client/preference/loadout/loadout_hat.dm

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

* Update code/modules/client/preference/loadout/loadout_uniform.dm

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

* Update code/modules/clothing/head/soft_caps.dm

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

* Update code/modules/clothing/under/jobs/cargo.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>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-09-20 14:19:10 +01:00
GDN
685e0ee506 fixes a bunch of turfs being active roundstart (#22233)
* fixes a bunch of turfs being active roundstart

* some ruins

* qwerty dun broke it

* main stations

* that should do it

* i'm blowing up qwerty

* should be it

* empty commit to check ci

* merge fix

* yippie

* joyous

* lavaland tax

* regex w

* I'm gonna fax mapmerge a low teir god gif

* SOMEONE ELSE GOTTA GET FAXED

* Update code/controllers/subsystem/SSair.dm

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-09-20 12:47:46 +01:00
Marm
5e8536871b Cargo QOL + Mail Bag Fix (#22500)
* aaaaaa

I forgot

* mailn't

Removes QOL.
2023-09-19 21:09:57 -04:00