Commit Graph

11562 Commits

Author SHA1 Message Date
Contrabang
472d7ec6f2 Fixes an issue with fake death (#22791)
* bam

* comment
2023-10-12 15:40:17 +01:00
Contrabang
42fb26fb8a before the do mob (#22779) 2023-10-12 15:39:47 +01:00
Contrabang
3fd8427218 Ashwalkers now use unathi clothing sprites (#22750)
* fixes this shit

* time to walk ash
2023-10-12 15:38:24 +01:00
Coolrune206
8277578c56 fixes ert borgs and safety override modules (#22623) 2023-10-12 15:29:46 +01:00
matttheficus
d5f5d1f744 Ash Walker Speed Only Works on Lavaland (#22789)
* man signals aint that bad

* gdn/contra review

* contra review 2
2023-10-12 15:27:35 +01:00
DGamerL
a837c0eb6b Removes nucleations (#22678)
* They be axed now

* Whoops, missed these

* Burza + Henri review
2023-10-12 15:26:44 +01:00
Octus
dcd1f5d88a Adds eight vox hairstyles because why not and stuff (#22573)
* god i hate myself

* donedone

* fixxxxx
2023-10-12 15:22:20 +01:00
Deniz
cae43f1f69 TGUI Bots Refactor (#22778)
* test

* M to user

* M to user

Did on phone after remembering user is is better than M. So it is individual commits

* small oopsie

* /bot/ui_data. thanks contra

* forgot comments

* comment edit

* test commit - ignore

* test worked
2023-10-10 21:53:48 +01:00
Qwertytoforty
64456806a5 [READY FOR REVIEW] I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna. (#22016)
* hard mode stuff

* further progress

* more progress

* pausing work to fix bug

* lets pr this mess

* more progress saving as vacation soon

* sleep_check_qdel

* saving work

* medals into deconflicting

* icons

* Fix compilings, medals

* Apply suggestions from code review

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

* yes

* Apply suggestions from code review

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

* earliest of the returns

* icons

* Apply suggestions from code review

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

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

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

* ah lateload, my beloved and hated with no debug points

* todoops

* requested changes

* move medals / move comment

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-09 21:45:41 +01:00
Qwertytoforty
3b618d47c2 Megafauna are no longer chronically afraid of chasms (#22782)
* megafauna are no longer chronically afraid of chasms

* drop that

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

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

* )

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-09 20:47:24 +01:00
Contrabang
c043babd51 fixes dusting 2 (#22749) 2023-10-09 20:46:24 +01:00
Mitchs98
a20394b49d Normal tomatoes can now be sliced. Tomato Meat now functions as meat. (#22744)
* tomat

* tomat 2.0, now with steak
2023-10-09 20:44:04 +01:00
Contrabang
35b3418f17 Pick-Darkness verb now supports command box input (#22687)
* pick darkness update

* oops forgot to remove
2023-10-09 20:39:15 +01:00
GDN
6df2c2e3d2 Ghost bar (#22368)
* Ghost bar initial changes

* more changes

* we ball again brothers

* we are (once again) SO back

* Update code/modules/admin/verbs/debug.dm

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

* Update code/_onclick/hud/alert.dm

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

* Update code/_onclick/hud/alert.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

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

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

* deck of cards and shittt

* global placement

* Update code/modules/ruins/ghost_bar.dm

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

* readded

* hotfix

* zamn

* fixes

* greyfix

* last of the fixes

* can't stop me baby

* bam

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-09 19:47:17 +01:00
Burzah
b02ce067bf Adds a nugget smite for admins (#22637)
* new smites

* part dos

* just nugget

* msg update

* forgot to move this

* Review

* added logmsg

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

Tested and applied!

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

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-10-09 20:00:29 +02:00
Contrabang
0512f8a674 wowee (#22787) 2023-10-08 20:05:35 -05:00
Alexios
c4e96e4ca0 Ports Humans from TG - Soul Massacre (#22361)
* Easiest PR of my life - adds new humans and culls your soul -  ProTip! Great commit summaries contain fewer than 50 characters. Place extra information in the extended description. - go fuck yourself github I will post the bee movie script if you don't shut up

* I'm dying because I'm so surprised.......

* I don't have any other memes heres the simplemobs I'll think of something

* Add new sprites and old sprites, man what nice guys

* Add code for first haul of races

* Attempted fix at CRLF to LF

* Fix indentation

* Move last code line fix pp
2023-10-07 11:16:30 +01:00
K3Licia
ff1fd1d2b8 New Taj Head & Hairstyles (#22349)
* Delete icons/mob/clothing/modsuit/species/taj_modsuits.dmi

* Add files via upload

* Delete icons/mob/clothing/species/tajaran directory

* Add files via upload

* Delete icons/mob/human_races/r_tajaran.dmi

* Add files via upload

* Delete icons/mob/sprite_accessories/tajaran directory

* Add files via upload

* Delete code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_hair.dm

* Add files via upload

* realized an inconsistency

* Add files via upload
2023-10-06 16:36:46 +01: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
Adrer
f221bf3ec4 You can no longer attack MMIs (#22685)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-10-03 17:49:33 +01:00
DGamerL
0fae71b79b Seems to fix it (#22680) 2023-10-03 17:48:13 +01:00
GDN
fe809bf8e1 fixes new players not always being able to use their keybinds (#22621) 2023-10-03 17:18:17 +01:00
meow20
79f472c84d Drask no longer slow down when cold. (#22612)
* actual pr

* Revert "actual pr"

This reverts commit 44c2fc296b.

* gamerCode
2023-10-03 17:14:48 +01:00
Luc
3e176f6e0d Carding AIs now takes time. (#22564)
* Adds a do-after for living AIs

* Fixes some leftovers

* do_after_once
2023-10-03 17:11:42 +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
matttheficus
9d0c74b687 Removes Bluespace Tile Speed, Replaces It With Anti-Slowdown (#22271)
* the start

* gear slowdown time

* nicer check

* trait time!

* dimach + henri review

* contra review

* sean review
2023-10-01 17:41:09 +01:00
DGamerL
ac385bdf5d Stops you from grabbing someone if you are horizontal (#22563)
* Gotcha! Oh wait-

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

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

* Works for now, oculd use a cleanup later

* Nice it works

* Contra review

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-01 16:20:18 +01:00
GDN
2d76b2117f Moves the lobby panel to the status panel (#22596) 2023-10-01 14:40:29 +01:00
Furior
7b02971f32 Fix/Tweak: Now admin logout messages are more important than mentor ones (#22560)
* Dunno

* oops
2023-10-01 14:31:29 +01:00
Octus
792ad7b904 Updates Sprite on Vox Breath Mask (#22422)
* updates mask

* fixes qwerty's concern

* recolor/better shade

* less phallus looking

* cleans a dupe

* new mask resprite thanks to McRamon
2023-10-01 14:21:46 +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
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
Luc
e757638648 Kills Check Pulse (#22501)
* unchecks verbs

* removes method
2023-10-01 11:41:39 +01:00
1080pCat
730897d29e Ghosts are now able to see N2O with the analyze air verb. (#22552)
* Update observer_base.dm

* Burzah review

* missed a  couple

* Update observer_base.dm

* Update observer_base.dm

* Update observer_base.dm

* Update observer_base.dm
2023-09-30 08:40:20 -04:00
meow20
1e15d92667 Fixes silicons from being unable to pick up cells from cell chargers (#22581)
* fixes silicons from being unable to pick up cells from cell chargers

* add a space, as with the convention.

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

* Update code/modules/mob/living/silicon/robot/drone/drone_items.dm

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

* Update code/modules/mob/living/silicon/robot/drone/drone_items.dm

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

* Update code/modules/mob/living/silicon/robot/drone/drone_items.dm

Co-authored-by: Luc <89928798+lewcc@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-09-30 08:38:02 -04:00
K3Licia
8b91ee45d7 pAI Manifest / Messager Default Software (#22586)
* Add files via upload

* Delete icons/mob/sprite_accessories/tajaran directory

* Delete code/modules/mob/living/silicon/pai/software/pai_apps.dm

* Add files via upload

* fixing this up

* Revert "fixing this up"

This reverts commit a05fa332c5.

* i am clinically insane

* Delete icons/mob/human_races/r_tajaran.dmi

* please be normal
2023-09-30 08:36:42 -04:00
dearmochi
ea93d78402 Fix death by brain damage spamming message (#22587)
* Fix death by brain damage message being spammed

* chore: remove redundant message
2023-09-30 08:35:49 -04:00
DGamerL
7b15c3f60b Fixes projectiles passing through the Desecrated Duel arena (#22588)
* Fixy fixy

* Make it not affect lavaland elites

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

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-30 08:26:10 -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
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
Contrabang
70b3652dc4 *collapse emote now does knockdown instead of paralyzing (#21958)
* bam

* balance changes

* 4 seconds -> 10 seconds

* henri review

* same crit changes, whoops...
2023-09-19 19:46:43 +01:00
Luc
719a86faea Adds a simple kudos system (#21731)
* Add simple kudos system

* oops

* Fix up the messaging

* convert to ckey-based tracking

* imagine being able to spell

* Adds some encouragement messages

* honestly quite incredible

https://user-images.githubusercontent.com/47290811/268751264-527a1f0a-3435-40f4-8cdf-1de005450037.gif

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* Apply suggestions from code review

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

* jimkil review 2

---------

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-19 17:44:03 +01:00
DGamerL
6481148747 Nerfs disarms (#22215)
* The thingy

* Oh my god I am a genius
2023-09-19 17:04:18 +01:00
DGamerL
86a36452ad Fixes Queen bees not being able to be mutated (#22443)
* Guh

* This too
2023-09-19 17:02:40 +01:00
BiancaWilkson
c559993703 brain undeleting juice (#22272) 2023-09-19 16:54:47 +01:00
Burzah
8530aa2b78 Removes appearance options not available to species from mirror (#22359)
* appearance menu checks

* review and flag change to moth
2023-09-19 12:04:12 +01:00
tristan1333
5028f63cd7 handheld mirror traitor item (#22042)
* Adds handheld mirror item and adds it to traitor items

* Adjusted cost for economy refactor

* Revert "Adjusted cost for economy refactor"

This reverts commit f31cbae8be.

* actually adjusts properly

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

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

* removes redundant proc

* Adds inhand sprite and adds herald cloak functionality

* Revert "Adds inhand sprite and adds herald cloak functionality"

This reverts commit 3b2531f509.

* undoes the toolboxdmi change

* REMOVES CODER SPRITE FROM DEVICES

* fixes a runtime

herald cloak would runtime when teleporting to a person holding a mirror object in hand/pocket

* stuns anyone holding a mirror when jaunted through

* fixes merge conflict and changes uplink description

* mergeconflict

* actually fixes mconflict

* please bro just fix the conflict bro please

* Fixpls

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2023-09-19 12:03:44 +01:00
Luc
788dd0fa00 Prevents mobs from emoting while dead (#22470) 2023-09-18 18:50:58 +01:00
DGamerL
4990604711 Xenos can no longer get viruses (#22395)
* Okay it works now maybe

* Oops this is the actual fix

* I am praying this went correctly

* Lewc review
2023-09-17 20:21:23 -04:00