Commit Graph

4073 Commits

Author SHA1 Message Date
PhantornRU
3aa6154a3d FIX: correct custom rank manifest modify (#23491)
* custom_rank_manifest_modify

* Update code/datums/datacore.dm

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

* Update code/datums/datacore.dm

* Update code/datums/datacore.dm

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-14 11:21:11 +00:00
Nathan Winters
48c0bfd5bc Fixes abstract outfit types showing up in the Robust Dress Shop (#23507)
* Exclude abstract subtypes from robust dress shop

* Fix typepath typo

* `vv_outfit.dm` cleanup
2023-12-13 16:32:12 +00:00
Venuska1117
bbc6b79708 Lavaland: Change drunk miner "structures" and add "no_lava" helper. (#23230)
* Added no_lava and make glif have more "shape"

* Did UNO REVERSE:
- Now drunk miners "structures" represent their "name" from lavaland.dm if they spawn on lava (visual).
- Expanded some drunk miner structures size & shape of "cave" they are in.
2023-12-13 16:29:31 +00:00
dearmochi
fe6492fa5a Fixes Lichdom preventing proper wizard round end (#23474)
* Fixes Lichdom preventing proper wizard round end

* move stuff around

* tab

* Update code/datums/spells/lichdom.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-12 21:15:19 +00:00
DGamerL
9b5f0bcbc7 Easy remove (#23476) 2023-12-12 21:14:26 +00:00
GDN
c12519307a adds a new tot item, the syndicate pop-up turret (#23347)
* adds a new tot item, the syndicate pop-up turret

* Update code/datums/uplink_items/uplink_general.dm

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

* Update code/game/machinery/portable_turret.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-12-12 20:24:42 +00:00
GDN
c9bc4635e0 makes action buttons bindable to keybinds (#22390)
* makes action buttons bindable to keybinds

* i'm just based like that

* zamn

* fix

* More alterations

* bruh

* runtime fix

* fixed up the jank

* Update code/_onclick/hud/action_button.dm

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

* Update code/modules/input/keybindings_procs.dm

---------

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
2023-12-11 18:56:20 +00:00
Octus
42de9cede7 oh yeah we nerfin (#23505) 2023-12-11 17:07:48 +00:00
DGamerL
2415dc5d02 Removes a few unused procs (#23470)
* Begone ye foul creature

* More scope increase
2023-12-11 17:06:28 +00:00
Daniel Lenrd
99e910602f Adds option to select out of 3 Syndicate Bundles (#23465)
* Thanks Ebba

* removing that one datum line

* updated description in uplink

* removes redundant list that is redundant

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

* Moved Comments

* Added Agent Spaces

* added a dot

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

* Update descrption + fix typo

* updated TC prices in comments

* Welcome message + bundle name updates

* Station Name

Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>

* Modsuiter to Augmented

Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>

* 3TC jacket comment

* Beacon + Naming + Comments

* forgot to save this file

* Empty

* slash formatting

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

* old SRC style

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

* item/item as anything in item

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-11 17:05:29 +00:00
Henri215
94cefac7cb Adds jani HUDs from Baystation! (#22654)
* Adds jani HUDs from Baystation!

* wrong place

* tweak to sprite

* contra review and tmeporary tweaks to the sprite

* finishing the sprites

* tweak to icon alpha and nv sprite

* typo

* conflict part 2

* test

* final adjustments

* DgamerL review

* fixing sprites

* changing name

* name part 2

* DGamerL review part 2

* wrong value

* nope

* equipment and janitorial categories

* Apply suggestions from code review
2023-12-11 16:52:54 +00:00
Aylong
825c2c8866 Converts Input List to TGUI Input Lists (#23396)
* Part 1

* Testing 1

* Revert "Testing 1"

This reverts commit fc06554b28.

* Part 1.1

* Part 2 - UI Style List

* Preferences lists

* Preferences lists - DONE

* More inputs

* MOOOOOORE

* UI style else

* Last ones

* Double name fix

* Pre-selected Search

* Return Pick Darkness

* Return Pick Darkness

* Missing users

* Some review changes

* Revert MULE lists

* I just hate MERGE CONFLICT label

* List window tweaks

* I think there it is

* why i am stopid

* Update tgui.bundle.js
2023-12-10 19:38:23 +00:00
ppi13
05bbd46ed8 Removes Filter (#23501) 2023-12-10 18:13:46 +00:00
DGamerL
8c66bcd2a7 My bad, sorry Rurik (#23413) 2023-12-07 16:25:26 +00:00
Octus
d949b6d04d cya (#23403) 2023-12-07 16:24:30 +00:00
Contrabang
c8dce33a8a Cleans up a lot of globals a few other vars (#23246)
* i hate globals i hate globals

* more fucking of these

* sirryan review
2023-12-06 15:30:41 +00:00
PopeDaveThe3th
05cf837409 Buffs a few spells (#23036)
* Buffs a few spells

* Keeps Lesser Magic Missile the same

* Update code/game/gamemodes/wizard/spellbook.dm

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

* no more doorpass

* mindswap changes reverted

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-12-06 15:26:38 +00:00
HMBGERDO
22f483637c Grab information on examine, no message spam when removing cuffs (#22201)
* grab messages, action messages

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

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

* less examine info

* cleanup

* from mob/list to status effects

* is gone

* Update code/datums/status_effects/neutral.dm

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-12-03 13:53:03 +00:00
Marm
9de9241cd3 20 (#23369) 2023-11-30 13:45:22 -05:00
Luc
5d5f83d791 Lobotomizes the brain from /mob/living/carbon (#23320)
* find and replace. this causes zero errors.

* there was one error

* repathing

* minor emote repathing as well
2023-11-29 18:39:43 +00:00
Luc
2d6545a291 Runechats emotes with sound effects. (#23255)
* Remove emote_sound from the codebase

* quick cleanups

* Update code/datums/emote.dm

oops

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

* gnarg

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-11-29 18:18:20 +00:00
GDN
a1f0f7e377 fixes some strange behavior with righting tilted objects (#23273) 2023-11-29 12:37:03 -05:00
Contrabang
bcc351ed6f misc fixes my beloved (#23327) 2023-11-29 12:29:32 -05:00
PopeDaveThe3th
124910bb3f feesh (#23348) 2023-11-29 12:18:04 -05:00
Qwertytoforty
09712e1541 makes 2 wizard weapons less of a pain to use. (#23356) 2023-11-29 12:15:40 -05:00
RomainzZ
5bc76dd0a8 Fixes mutable_appearance where it causes UI bugs (#23391)
* Fixes mutable_appearance where it causes bugs

* Now we will get filters of an obj
2023-11-29 16:43:18 +01: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
Luc
9f9db15c8b Defibs now shock people giving CPR (#23257)
* defibs now shock people giving CPR

* use isnull instead

* humanoid like me
2023-11-24 15:33:01 +00:00
Luc
0b4a2bb5cf Adds LOOC to runechat. (#23256)
* adds looc to runechat

* remove hearers

* remove unnecessary parens

* Prevent observers from LOOCing runechat

* Update code/game/verbs/ooc.dm

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

* contra review

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-24 15:32:31 +00:00
Daniel Lenrd
4a3437355e HUDs can now only change status with sufficient ID access (#23086)
* Added mental to MedHUD

* Made HUDs write based on ID access

* Makes Chamelion secHUD have write access

* adds trailing newline in defines

* med examine spacing adjustment

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

* sec examine spacing adjustment

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

* 0 and 1s

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

* removes the sec_hud_set call, probably a bad idea

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-24 15:29:59 +00:00
DGamerL
7181d869d7 Buffs His Grace (#23040)
* This should be most of it

* I forgor to push this

* Makes this look better too

* Slight last things

* This has to be 0

* Fixes everything being broken all at once

* Fixes ascension eating the owner

* Extra insurance

* Removes debug messages

* The most minor of optimalizations

* Sirryan review

* Cleaning up the files

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

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

* Removes unneeded variables + Lewc review

* Ternary my beloved

* Checks the correct thing

* Less bloodthirst per second and back to 25 victims

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-24 15:29:13 +00:00
DGamerL
307120e7d3 Patches and pills are now no longer subtypes of food (#23063)
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

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

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

* Some missed patches

* Apply suggestions from code review

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

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

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

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

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

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

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-21 15:37:16 +00:00
Octus
ba44b18102 Removes Barber because its a poorly designed role (#23053)
* solong

* test

* update

* fixififixx

* ok back to barbers

* spring cleaning

* i hate you safety scissors, genuinely

* space fix

* reviews

* Update sechud.dmi

* Update card.dmi
2023-11-21 13:10:13 +00:00
Vi3trice
f70b534aee Tweaks Load Lawset to differentiate between admins and normal players, admins can choose to not change zeroth laws (#22842)
* Naughty borgs

* I'm warning you

* typo

* Update law_manager.dm
2023-11-21 12:59:45 +00:00
S34N
547ce531a7 Cyberiad Bridge remap (#23015)
* initial

* final changes

* edits

* PDA, errors. etc.

* further tweaks

* do a flip

* glass APC

* shuffle continues

* move AI upload to sci, restore old shop and explorer room

* pipes!

* statue fix

* warrior fixes

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

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

* denth request, merge conflict fixes

* area shuffle

* wall furniture my beloathed

* fixes teleporter, fixes ventless AI upload

* minor fixes

* more tweaks

* Update code/game/area/ss13_areas/engineering_areas.dm

* more fixes

* grav gen shuffle

* messaging server APC move

* move AI upload again, fixes

* further tweaks

* minor tweaks

* minor fixes

* nukes supply sop

* git-gor fixes

* disposal fixes

* cable fix

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-20 15:49:36 -05:00
Adrer
0bf67f14a7 [s] Fix teleporter recursion (#23265)
* Prevent teleporting onto a tile with a teleporter

* True and false

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-11-14 19:32:51 -05:00
Aquilar
d27ead5c0e fixes admin given assassinateonce objective. (#23177)
* fixes admin given assassinateonce

* replaces accidently removed comment

* requested adjustments
2023-11-14 13:01:32 +00:00
DGamerL
09181bb061 Buffs the Prince of Terror (#22421)
* The fast prince of belair

* The charging prince of belair

* Lewc review

* Update code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm

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

* Sean review

* Sirryan Review

* Range is now 9 for widescreen

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-13 18:16:38 +00:00
Contrabang
48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777)
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

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

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

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

* fuck

* bah

* Update tools/ci/check_grep2.py

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

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-12 20:59:43 +00:00
GDN
35754c77ea Verb cleanup (#22224)
* Verb cleanup

* rest of the object verbs

* little more object cleanup

* more changes

* last of it

* this too

* tgui

* code review

* time to go
2023-11-12 20:19:17 +00: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
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
Aquilar
14fbf2b4a9 Adds "Teach them a lesson" Objective (traitor only) (#22933)
* Adds the tech them a lesson objective.

* minor changes

* SPACING!

* onesmallupdate

* requestedchanges

* requestedchanges
2023-11-04 16:30:16 -04: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
GDN
4647342219 fixes radios doubling up on frequency sometimes (#22963) 2023-11-03 20:04:14 +00:00
Qwertytoforty
ed8406d707 You have unlocked: Greedier mode! (#22884)
* You have unlocked: Greedier mode!

* Apply suggestions from code review

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

* Update debuffs.dm

* 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>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-01 20:11:08 +00:00
GDN
e7b396eddf Silicon Chamo properly hides huds (#22312)
* hide hud

* more documentation

* Update code/modules/mob/mob_vars.dm

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

* Update code/modules/mob/mob_vars.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-11-01 20:10:15 +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
DGamerL
49afcce327 Purging the wishgranter (#22976)
* Everything except the map

* Deletes the ruin

* Makes CI not fail

* I pray this fixes it
2023-10-31 18:46:43 +00:00