cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 05:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,335 Commits 26 Branches 2 Tags
2ec6a3adfcdc092cbee5cafbcd8b712e0822fa45
Commit Graph

2729 Commits

Author SHA1 Message Date
Contrabang
8352613d03 Adds CI for missing icon_states (#27063) 
* Adds CI for missing icon_states

* yeah

* more fixes

* more fixes

* seems good

* moar

* fix

* yea

* hrtyhrt

* yeah

* WOE
 2024-11-14 17:58:06 +00:00
DGamerL
6520ce469c Removes /structures/ (#27339) 
* Removes /structures/

* Add updatepath
 2024-11-14 14:00:41 +00:00
warriorstar-orion
bfb18b48e4 dmdoc: Some cleanups. (#27242) 
* dmdoc: Some cleanups.

* satisfy check_grep
 2024-11-13 13:37:37 +00:00
Chap
d90a70ecda [REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743) 
* IT WORKS UP UNTIL THIS POINT

* Consolidates SLOT_FLAG and SLOT_HUD into one

* Remove cover_both_ears

* SLOT_HUD to ITEM_SLOT

* Remove clothing_trait changes for the time being

* Remove accidental copy-paste

* Re-add no-slip var

* More failure to copy-paste correctly

* Leftover flag

* Combine left and right slot flags where possible

* UNGOOF MY DEFINES, PHAND IS NOT A THING

* Minor spacing changes

* Some more fixes from merge

* Seperates ITEM SLOT AMOUNT into two defines

* ON SECOND THOUGHT LETS NOT DO THAT.

* Addresses Contra's review

* Thank you GREP

* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES

* Added a comment to the bitmasks in clothing defines

* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY

* These are for a seperate PR.

* Magboot fixes

* Requested changes

* Re-add accidental removal

* Wrong flags

* Update code/__DEFINES/clothing_defines.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Requested changes

* Merge fixes

* Fix double headset

* Fixes multiple accessories

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-11-13 13:02:29 +00:00
Aylong
416740d1b4 Fix cardboard boxes skins (#27156) 2024-11-10 13:46:25 +00:00
Henri215
b38c4bbd4c A few description grammar fixes (#27134) 
* Double spaces

* more space and misspelling

* Fixing punctuations

* Not now

* double dots

* Apply suggestions from code review

Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-11-10 13:38:28 +00:00
Spaghetti-bit
afd52f006a TGUI Color Picker (#26326) 
* Init

* Implements `tgui_input_color`

* Implements most color wheel conversions to TGUI

* Iteration two, went over titles and made sure most color inputs are functional.

* Implements preferences for large buttons, swapped buttons, and disabled TGUI

* Iteration three... the weird ones. (as null|color)

* Removes `as color|null` and `as null|color`

* Merge conflict resolution, again.

* Color input bundle and panel bundle

* CSLint being picky.

* Picky `while ()` instead of `while()`

* Apply suggestions from code review

Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* WIP

* de-bri'ish colour into color

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Aylong review applied.
- Removed an extra space in machine.dm
- UI_STATE

+ Runechat color now uses TGUI_INPUT_COLOR

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Removes an unintentional space to `paradise.scss`

* Update code/modules/tgui/tgui_input/color_input.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Adds "is_color" regex from TG

* Fixes a few conflicting files

* TGUI Merge conflict moment v3

* V4?

* V5....

* God please don't explode. Builds TGUI like the linter wants.

* Update code/modules/tgui/tgui_input/color_input.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Rebuilds TGUI, again <3

* Lint be damned

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-11-07 21:24:45 +00:00
Contrabang
0f717d660a Adds CI to forbid some istype(src) checks. (#26980) 
* first set of changes

* the last checks

* actually builds

* Update code/modules/surgery/organs/subtypes/standard_organs.dm

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

* Update tools/ci/check_grep2.py

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* 1 fix (cigarettes) and better encapsulation in files

* yeeep

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-11-06 12:56:36 +00:00
Toastical
08b74db517 BRPD Auto-wrenching (#26855) 
* Modified the RPD auto-wrenching behaviour
* Removed tool requirement for auto-wrenching
* Allowed the BRPD to auto-wrench remotely
* Added a TGUI toggle for auto-wrenching

* Added a Line of Sight check for the BRPD
* Readded missing UI buttons

* Tweaked disposals construction
* Disposals objects can't be anchored if there's floor tiles
* Bins, chutes and outlets now need a constructed trunk to be anchored.

* Changed LoS check, added sounds, stopped station auto-wrench.

* Final touches for the RPD
* Added sounds when wrenching occurs

* tgui bundle

* Consolidated all RPD related sounds to the RPD code

* removed some redundant things I forgot about

* tguibundle

* span classes and tgui bundle

* Applying lewcc's suggestion

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Toastical <vnndvp@gmail.com>

* applying lewcc's 2nd suggestion

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Toastical <vnndvp@gmail.com>

* Applying contrabang's suggestions + added marks in pipe.dm

* typos n stuff

* tgui bundle

* Update code/modules/recycling/disposal-construction.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: Toastical <vnndvp@gmail.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-11-03 13:47:20 +00:00
warriorstar-orion
e80594d34a fix: update random plant menu icon (#27252) 2024-11-03 13:16:27 +00:00
Chap
580fb4ba9a [TWEAK] Cryopod now give you a HUD alert that you can click to ghost (#26808) 
* Cryopod now throws an alert when entered.

* Makes these subtypes

* Requested changes

* Requested changes

* Update code/_onclick/hud/alert.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-11-02 11:37:24 +00:00
Chap
25df9aacd8 [FIX] Personal lockers fix (#27131) 
* We can't have nice code

* Trailing newline

* Also fixes double closing sound

* Move invalid ID check all the way up

* Early return makes this if statement unnecessary.

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-10-23 21:14:56 +00:00
1080pCat
3b944d6786 The syndicate depo closests actually use their sprites + door sprites. (#26974) 
* The syndicate depo closests actually use their sprites + door sprites

* animated
 2024-10-23 21:09:33 +00:00
warriorstar-orion
9465b565b8 refactor/ci: enforce mapload in Initialize args (#26878) 
* refactor/ci: enforce mapload in Initialize args

* add new missing mapload arg

* add yet another missing mapload arg

* Update code/modules/power/engines/singularity/particle_accelerator/particle.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-10-23 19:07:46 +00:00
Sean
cff934146a Revert "Ports the Power Transmission Laser" (#27170) 
* Revert "fixes this bloody laser (#27167)"

This reverts commit 1bec4cd8a7.

* Revert "Ports the Power Transmission Laser (#26928)"

This reverts commit 592b7c3ec3.

* this lol

* TGUI
 2024-10-22 19:46:13 +00:00
Contrabang
e3c0198737 Adds CI to prevent manual calls of update_icon_state, update_overlay, etc. (#27010) 
* CI something something

* last fix
 2024-10-22 12:46:00 +00:00
Silverplate
7f7f9c6e0e Makes Plastitainum windows more resistant to large mobs (#27079) 2024-10-22 09:32:57 +00:00
DGamerL
0de5807260 Fixes inhands for fake artefacts (#27074) 2024-10-22 09:31:40 +00:00
Bm0n
ade220d0cb Ports Jumpskirts! (#26935) 
* wip test 1

* sprites

* code added

* vendors and locker spawns set

* added to prisoner locker

* accidental deletion

* sprite fix

* Update code/modules/clothing/under/color.dm

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

* new kidan sprites

* Update code/modules/clothing/under/color.dm

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

* Update code/modules/clothing/under/color.dm

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

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-10-22 09:22:00 +00:00
Migratingcocofruit
592b7c3ec3 Ports the Power Transmission Laser (#26928) 
* wip

* some formatting and copying over UI

* it compiles now

* oops

* Moves WATT_TICK_TO_JOULE to the power defines file. fixes UI

* spelling and announcement fixes

* Handle offsets for different directions

* laser comes from the correct tile now

* Added north and south sprites for the laser

* Adjust offsets for north and south sprites

* finished all north and south sprites

* tgui rebuild. Also sprites and code begoon

* Rebuild TGUI

* put PTLs in maps

* Repositions PTL room door in cyberiad

* fix if spacing

* undef and unundeffed define

* Removed overlapping stuff in some maps

* Actually makes the changes to metastation

* Fixes more mapping stuff

* Fix more unit test failures

* unmirror multitile component grid

* Fixes multitile

* explosions no longer make a hole in the beam

* This should fix it

* Stray pipe begone!

* Ok I think I fiigured it out

* Rebuild Tgui

* removes redundant removals of components parts and a redundant check. various style fixes

* Adds blocking to the beam and objects other than living beings take damage now.

* not using kwargs now. should work.

* Style changes and fixes some mobs getting hit by the laser that shouldn't be.

* Review changes and fixes trying to access wall turf's location.

* allow the new wall turf to form to we can properly access it.

* Moves the ptl beam effect to an atom proc that is overriden by the different types of things that can end up in the beam.

* Fixes some comments, adds clarifications, removes redundant usage of src

* moves the announcement threshold to a global var. Fixes ghost interaction.

* Revert "moves the announcement threshold to a global var. Fixes ghost interaction."

This reverts commit 7916ee76a1.

* Makes announcement threshold a static variable of the PTL

* power safty check on the mob ptl function

* Rebuild TGUI
 2024-10-22 09:20:19 +00:00
Chap
204f7985c4 [FIX] [IDB Ignore] Closet emag sparks disappear again (#27126) 
* Spark overlay now disappears again

* Icondifbott no diffing!

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-10-17 11:08:48 +00:00
Chap
c3d773402c [REFACTOR] Remove the flying var, adds the flying trait. (#26881) 
* Remove the flying var, adds the flying trait

* Remove flight when broomstick is unwielded

* Adds some comments

* tab indentation

* Fix carp flight

* Remove comment

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-10-16 17:46:19 +00:00
Chap
388c02beec [FIX] Changes the engineering locker sprite to be correct (#27109) 
* Changes the engi closet sprite to the right one

* Wrong name

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-10-15 15:32:34 +00:00
Chap
4cef80facb [FIX] Guncabinet overlay fix (#27107) 
* Draw guns before the doors

* Added a comment.

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-10-15 12:30:33 +00:00
Chap
429bebc613 [FIX] Animated closet fixes (#27102) 
* Some animated closet fixes

* Trailing newline

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-10-15 01:09:04 +00:00
Contrabang
c15a5bbf59 Fixes invisible signs on mining shelters (#27073) 2024-10-14 15:05:50 +00:00
Chap
b51cc0f31c [PORT/FEATURE] Animated closet doors (#26832) 
* Adds animated closets

* Remove unecessary icon states and fixes secure closets

* Actually fixes secure closets

* Please our linting overlords.

* Fixes non-crate subtypes

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Moved legacy closet icons to seperate file

* Remove some unused variables

* GC

* Moved to proper destroy

* It's good when code compiles

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-10-14 14:05:16 +00:00
PopeDaveThe3th
ed8809a4fc Fixes Soviet Mobs being Invisible (#27064) 
* i feex

* statue
 2024-10-12 11:26:24 +00:00
PopeDaveThe3th
e657597b1c [LORE] Replaces most uses of "Russian" with "Soviet" (#26822) 
* no russian

* space

* more spaces

* Update walls_mineral.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update space_ruins.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2024-10-10 09:57:42 +00:00
PollardTheDragon
46887a37f9 Thurible - Holy Incense Burner (#26713) 
* Thurible Code

* No Belt Slot

* No more emag act.

* Unholy water corruption fix

* Added jestosterone and nothing to acceptable reagents. Honk

* Item sprites

* Better bad chem purge messages

* Inhand Sprites

* Variable Format

* Formatting, Visible Messages, Inhand Updating

* Removed extraneous check

* Loc fix

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

* Readability of reagents var

* Guard clause on corrupted reagent addition

* Moved container type to vars

* Better check for sprite update

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-10-10 09:46:26 +00:00
Сиротка
a5a199392b Tweak: Revision of miners' and explorers' gear. (#26525) 
* Tweak: Revision of miners' and explorers' gear.

* Remove drake changes

* Remove armor-related changes

* Update machine_vending.dm

* Update machine_vending.dm
 2024-10-10 09:44:02 +00:00
warriorstar-orion
62b65f8a91 Rework Lavaland tunnel themes. (#26599) 
* Rework Lavaland tunnel themes.

* Fix deeprock mob density; ensure 1 vetus/bubblegum

* goddamnit

* bring spawn odds closer in line to head, fix tendril collapse range

* Move define to global dir

* don't need initial here

* define magic number properly

* make type of var clear

* CHECK_TICK during procgen

* less tendril cities, no tendrils in oasis centers

* revert no_lava helpers for now

* add NO_LAVA_GEN flag check back to safe_replace

* add blackbox feedback for themes
 2024-10-10 00:05:29 +00:00
DGamerL
89796a055b Makes RemoveComponent more sane (#26877) 
* Makes RemoveComponent more sane

* An even better wrapper

* Update code/datums/components/surgery_initiator.dm

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

* Update code/datums/components/_component.dm

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

* Update code/datums/components/_component.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/datums/components/_component.dm

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

* Update code/datums/components/_component.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-10-09 18:46:04 +00:00
1080pCat
04c110cb2b Update shelves.dm (#26938) 2024-09-29 17:24:33 +00:00
kyunkyunkyun
882b1e4a0b Fixes safe being unable to pick up spawner/random/ (#26891) 
* Safe fixing

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

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

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-09-29 09:52:38 +00:00
warriorstar-orion
b61f4f3ff8 feat: Storage shelves and gun racks. (#26744) 
* feat: Storage shelves and gun racks.

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* review comments

* better examine

* fix lint

* Examine for empty shelves

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* rest of review comments

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-09-28 22:28:44 +00:00
Contrabang
900271af91 Updates OD lints (#26729) 
* yea

* update lints

* lint changes and code fixes

* i hate old code

* dont make this an error
 2024-09-27 17:02:16 +00:00
Toastical
be71a2b55c R-Girders no longer falsely claim to be displaceable (#26876) 2024-09-27 05:21:28 +00:00
Contrabang
ee6f73973e Fixes problems with multiple sources of alpha on humans (#25884) 
* lets gooooo

* this too

* comments

* update code

* im so good

* tested, it works now

* Update code/game/dna/mutations/mutation_powers.dm

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

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
 2024-09-26 18:06:44 +00:00
Contrabang
902b898e45 Fixes False Wall Smoothing (FOR GOOD THIS TIME) (#26828) 
* Fixes False Wall Smoothing (FOR GOOD THIS TIME)

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

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

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-09-26 00:14:18 +00:00
Adrer
bc6a2fb593 You can now map in flipped tables (#26825) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-09-25 10:11:28 +00:00
Silverplate
21cab7b26f Fixes #26522 | Wheelchairs with bots are now dense (#26838) 
* wheelchairs are now dense when bots are placed on them

* adresses DGL review
 2024-09-25 10:10:33 +00:00
ElorgRHG
55a8675cc5 Paradise's soul removal part 7.25: firesuits, radsuits, workboots and all magboots (#26671) 
* Firefighter suit, atmos firesuit and radiation suit resprite

* Atmospherics firefighter helmet and radiation hood resprite

* Magboots resprite

* Workboots resprite

* Removes old firesuit, hardhat, radsuit and radhood sprites

* Deconflict

* Deconflict 2

* Very slight syndicate magboots adjustment

* Inhands, suggestions and icon renames

* Unused heavy firesuit removal

* Sprites for new kidan
 2024-09-23 21:53:45 +00:00
Erikos66
1cc99e0b60 Makes nest ghosting clearer (#26735) 
* Update alien_nests.dm

* woopsies

* spacing fix

* Clarifies text (Thanks Contra)

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Erikos66 <bhoughton66@outlook.com>

* More spacing (Thanks Lewc)

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

---------

Signed-off-by: Erikos66 <bhoughton66@outlook.com>
Signed-off-by: Erikos66 <155964994+Erikos66@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-09-22 22:59:22 +00:00
warriorstar-orion
63855ede3c fix: AI Eye movement runtimes (#26792) 2024-09-19 02:26:19 +00:00
Coolrune206
fb199c82b9 fixes saber spelling (#26766) 2024-09-19 02:26:03 +00:00
Luc
23b4f2837a revenants can now flip tables (#26747) 2024-09-19 02:25:58 +00:00
Qwertytoforty
7be7ec7090 reflectors anchor on mapload (#26745) 
* anchors reflectors on 2 maps to not troll engineering

* anchors on mapload
 2024-09-14 02:54:45 +00:00
Kyani
32719e2f99 Adds map: EmeraldStation (NSS Diagoras) (#26438) 
* fleshed out engi and asteroid

* command work

* more department fleshing out: sec

* sec work

* perma work

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* med and dorms fleshing out

* sci and service fleshing out

* Update EmeraldStation.dmm

* APCs done + detailing

* Update EmeraldStation.dmm

* wire work

* more wire work

* wires and LIGHTS

* ATMOS DONE now onto DECOR

* AI/status monitors

* intercoms and newscasters

* Wall items and cameras!

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* moved the file to the correct area

* bugfixes, starting up the map

* refining the asteroid

* merge fixes

* logs of bugstomping

* more bugfixing

* bugfixing

* bugfixin

* trying to make the stupid lava work

* adds plasma vent for test

* more testing

* swapped file places

* vents work now!

* Update paradise.dme

* vent sprite update

* file corrections

* Asteroid MILLA changes

* adds a new MILLA atmos  type

* Build MILLA

* oopsie

* fixes

* removed testing code

* reverts map start

* reverts the atmos change

* respriting geyser

* comments

* Update code/__DEFINES/atmospherics_defines.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update geyser.dmi

* Update paradise.dme

* fixing past merges

* adds some missing items from merges

* reverting

* reverts changes again

* deleted unused file

* oops forgot nearspace areas

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Lots of map fixes

* Update EmeraldStation.dmm

* trying to unfuck the milla merge

* removed station from dme

* fixes/small tweaks/suggested changes

* removed errant turret

* redid telecomms

* Update EmeraldStation.dmm

* rebuilding everything

* redoing security

* more sec work

* perma shaped up + more items

* renamed properly this time

* resetting atmos code

* more secwork and move papers off varedits

* more secwork + dorms + funeral services

* added new areas + pipe/wires/floors

* security electrified windows/wires/alarms/lights

* cameras, dorms pipes/ires/alarms/apcs

* merged

* disposals

* lots of wall things + added map datum for testing

* pipe fix for linter

* fiddled with maints

* minor maint edits

* fixes + maint work

* more bugfix

* even more bugfixing

* MORE nearspace fixing

* dumb nearspace fix

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* a LOT of fixes + door access

* disposal pipe update  script

* oops linter fixes

* fixed viro button runtime

* finished maints + space decor

* removed hall light switches

* fixed solars areas

* removed errant lattice

* remove agent B from asteroid

* wall bump placement refining

* apc fix

* bugfixing

* minor maint change

* bugfixing

* burn tile on node fix

* changed official name

* bugfixing

* added genetics locker+figures

* bug hunting (buttons mostly)

* added firelocks. oops

* added temp webmap + bugfix

* Update emeraldstation.dmm

* new webmap. again

* added the perma tools

* nanomaps

* bug fixes, fixes, and more fixes

* more tweaks

* cable fix

* more bugfixing

* Update emeraldstation.dmm

* tiny fix

* fix AI sat turrets

* more bugfixing

* MORE bugfixing

* bugfix + ruins soundfile

* pipe bugfix

* fixed toxins pipes. junctions bad?

* swimwear :)

* remove errant QM gps

* rnd shutter button missing

* potato layering fix

* add bridge request console

* fix window tint in interrogation

* added some clothes

* nanomaps2, asset boogaloo

* modified an empty hall, added some perma cams, minor fixed

* forgot to save before push oops

* widens sci maint hall + bugfix

* gives theatre its autodrobe back!

* moved borg spawns

* moves nuke op default spot

* new asteroid mix + botany tweak

* adds cremator button

* new sign + moved pod + bugfixing

* cable fix

* engine, sci chem, and surgery tweaks

* more bugfixes and tweaks

* more tweaks

* adds a few windows back to robotics

* bar was missing pun pun!

* corrected misplaced atmos machines

* re-added the bathroom

* fixes atmos waste disposal injector

* modified mr potato

* changed bathroom area

* minor toxins tweak

* small wall decor tweaks

* removes errant lights

* removes errant opier

* LOTS of fixes/tweaks + adds CO2 to asteroid

* gave maint some boxes + cable fix

* duped brig lock

* adds masks to medbay storage

* adds missing gues passes

* cleanup from kitchen rework

* gives solars enough glass to complete it

* adds another defib to cryo pods

* makes asteroid sign fireproof

* perma maint now opens with virus + bugfixs

* bugfixing + adds missing holopads

* more holopads + bugfix

* adds some smoke vendors

* kitchen area tweak

* fixed errant rack

* rearranged/spread out cig vendors

* moved a cig machine again

* added RD tint button

* undid a brig area change

* removed errant posters

* added filing cabinets + bugfix

* maint morgue tray fix

* adjusted chapel + bugfix

* fixed palms + minor sec floor tweak

* adds forgotten magi and clown starts

* gave engi a shower

* reworked robotics + atmos bugfix

* geysers now work at 1/10 capacity when overpressure

* bugfixing + tweaked overrides/variables

* rework warden office

* bugfixes + adds some holopads

* added missing bio shutter

* more small tweaks

* adds RnD rework + gives mag some things

* fixed fabricators

* tweaked robo + added rnd server board

* added rnd backup circuit

* bugfixing

* bugfixing again

* bugfixing

* fabricator fix

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-09-13 18:18:25 +00:00
Christasmurf
1f9945ee5f Captain's sabre - Resprite and rebrand (#26592) 
* rapier-rebrand

* extdesc change

* indentation

* Update code/game/objects/items/weapons/melee/melee_misc.dm

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

---------

Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-09-12 17:24:14 +00:00