cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-22 08:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

2751 Commits

Author SHA1 Message Date
1080pCat
f34444a34d mhm (#24125) 2024-02-14 12:15:10 +00:00
warriorstar-orion
9b79902cf7 cere: create distinct nearspace area for disposals (#24096) 
* cere: create distinct nearspace area for disposals

* catwalk restore

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-14 10:14:59 +00:00
Zack
1aac1b8d7d POWER!! (#24082) 2024-02-14 10:04:43 +00:00
Zack
bb0f5a22b2 cameras (#24077) 2024-02-14 09:58:44 +00:00
Zack
a268af22ef Puts evidence secure lockers in evidence room in brig on Cerestation, delta, meta and on box station (#24037) 
* Secure lockers

* guh random APC

* secure safes

* fixed a issue

* Update security_lockers.dm

* Secure evidence lockers

* Update security_lockers.dm

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update security_lockers.dm

* evidence lockers for the dective

* fixed a funny error

* fixed a few issues

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-13 19:17:28 +00:00
Zack
c8dfc82a1d Fixes the area around medbay on boxstation (#24026) 
* Area added to map medbay thru VSC

* Maps medbay

* fixed a issue

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

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

* light switch

* Update medical_areas.dm

* Update medical_areas.dm

* Update cyberiad.dmm

* Update medical_areas.dm

* Update medical_areas.dm

* removed a light switch wall

* Update medical_areas.dm

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
 2024-02-13 17:23:22 +00:00
Venuska1117
65b71f87fa Making Burn Medkit more Accessible in Delta Engineering. (#24030) 
* Do requested changes.

* woopsie

* Decreasing lines changed to minimum.

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-13 14:25:38 +00:00
warriorstar-orion
e160d04884 meta: fix an incorrect storage belt type (#24005) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-13 14:22:21 +00:00
Zack
96003a3464 Fixes Availability of Request Console differs between stations (#23957) 
* bam headshot

* yeet dupe console on cere

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-13 14:12:10 +00:00
warriorstar-orion
9bee989533 meta: remove grille lootdrops (?) (#23935) 
* meta: remove grille lootdrops (?)

* add a few holes in the grilles for map consistency

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-13 14:03:28 +00:00
warriorstar-orion
13fe9de251 meta: small service adjustments (#23918) 
* meta: small service adjustments

* move air alarm bump off table

* remove redundant name helpers

* actually keep namers but remove varedits

* remove tables on top of walls

* remove pipe to nowhere and flying camera

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-13 13:58:53 +00:00
Zack
e54f32774f Maps the area around the main hallway's on meta map (#23832) 
* areas done

* damn other things

* fixed a a funny

* I tripped

* fixed what warriorstar-orion suggested

* Update public_areas.dm

* guh why we have so many areas

* fixed what Henri215 suggested

* removed the not needed light switches

* removed a few more light switches

* removed a light switch

* removed a light switch again
 2024-02-13 13:48:51 +00:00
Zack
241892e9ec Maps the areas in the main hallway's on delta map (#23831) 
* damn I tripped

* fixed what DGamerL suggested

* Fixed a hallway

* Fixed what Henri215 Suggested

* Update public_areas.dm

* Update delta.dmm

* fixed a fail

* Cameras

* removed the not needed light switchs

* Fixed what Henri215 suggested

* remove a couple light switches

* removed a camera

* removed a camera and added a light

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-13 13:47:48 +00:00
Zack
9b56b96a8d Fixes labor camp airlocks bolting open during a greytide tide event on NSS cyberiad (#23981) 
* damnit

* Fixed what DGgamer said on discord
 2024-02-12 21:40:18 +00:00
DogeDogIs
a07b8ed362 Fix Port Hallway having no scrubbers or vents (#23924) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 20:55:27 +00:00
Zack
e60980511a shit I tripped (#23923) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 20:55:00 +00:00
warriorstar-orion
4f62f8f022 box: move changs newscaster off APC (#23856) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 20:27:24 +00:00
warriorstar-orion
857e95f04a cere: starboard disposals remap (#23894) 
* cere: southeast waste belt remap

* nearspace

* this shit just floating in space

* i never add enough lights

* no free spacesuits

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 20:21:27 +00:00
warriorstar-orion
921e6140c4 box: standardize whitespace in list varedits (#23841) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 20:20:25 +00:00
warriorstar-orion
69fe234cb0 Add and apply cargo bay/shuttle access (#23819) 
* Add cargo bay/shuttle access, keep HOP to office

* Miners don't get Bay/Office access unless needed.

* NTR gets supply shuttle and cargo bay access.

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 17:11:01 +00:00
Zack
921865e637 Fixes a funny windoor (#23793) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 16:56:08 +00:00
1080pCat
6f6c4a9e47 The great SSU securing of 2024. (#23784) 
* locks the things

* why the actual heck were some of these using indents???

* no cheese

* Revert "locks the things"

This reverts commit b5f7cad8bb.

* relocks most™️ SSU's

* emag effects.

* i may be stupid.

* Apply suggestions from code review

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

* woops

* Update code/game/machinery/suit_storage_unit.dm

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

* 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>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 14:25:38 +00:00
warriorstar-orion
c875b9cc35 ci: ban non-integer gas filter types (#23747) 
* ci: ban non-integer gas filter types

* delta: fix filters not using filter constants

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 14:09:47 +00:00
Venuska1117
95a3014ebe Fixes some stuff for "Metastation: Maintenance Rework [Part 2]" (#23736) 
* Batch of fixees:
- Moved south maintenance airlock with lead to space more east (right) so it dont make ugly dual-walls.
- Removed one wall in maintenance where freezer and "Hacker" walls were colliding, to remove dual-walls and placed grid there.
- Added missing cable at robotics, there was cable leading to nowhere.
- Added missing robotics wardobe and locker (there should be 2, but was 1)
- Fixed maintenance freezer door assembly to be unmovable.
- Replaced oil slime extract, with blue oil slime extract.
there is *maybe* something i changed but i forgor 💀

* Changes requested by Aylong220
- Did all changes requested from github post.

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 14:04:24 +00:00
Deniz
ff20581d54 [DELTA] Atmos Remap Revival (#23705) 
* copy paste

* CI check

* Fire alarm

* Double pipes

* yellow pipe

* yellows again

* supply and scrubber duplicate

* apc cable

* flipped filter

* typo

* filter type fix

I read "2" as "n2" as filter type. welp fixed now

* empty commit

* turns out I deleted a tile oops

* Merge remote-tracking branch 'upstream/master' into Kerberos-Atmos-Remap-Revival-Electric-Bogaloo

* reviews 1

- Lights
- Table
- Scrubber
- Super APC
- high voltage moved up

* high voltage sign

- offset now

* requests

Thanks CRUNCH

* food path update

* Revert "food path update"

This reverts commit 6c684adde0.

* food paths again

* food path yay

* chairs + empty commit

* runtime fix

* DG reviews

Moved supply pipes for the north east vent in SM to west, following the scrubber line across the room

* pipe issues yippie

> these pipes have caused more delams than actual tots keep it in- gdn

* reinforced floor

* Wall + light tile update

* reviews

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-12 09:55:46 +00:00
Qwertytoforty
753dcba4d9 Wizard crash shuttle walls are now not weldable, however the windows are now reinforced plasma (#23808) 2024-02-08 21:14:03 +00:00
Zack
7591476496 damn keys (#23979) 2024-02-06 20:12:59 +00:00
DGamerL
d23569d256 Changes two slime cores to not busted cores on Meta (#24039) 2024-02-06 17:53:16 +01:00
1080pCat
5ddd534154 Fixes cereberon's RnD buttons being misslabled and in one in a bad spot. Also moved a horridly placed table. (#23729) 
* Update MetaStation.dmm

* ven.

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-06 14:13:20 +00:00
Zack
881755db95 Fixes windoors of the robotics lab on nss kerberos and nss farragus are not electrochromic (#23688) 
* cool shades bro

* funny airlocks

* to see the merge conflict

* Update .vscode/settings.json

* fun

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-06 14:07:17 +00:00
Zack
4219e9dbcd Changed airlocks to airlock helpers on NSS, Kerberos, NSS Cyberiad, NSS Cerebron (#23634) 
* airlockhelpers

* did some things

* fuck you doors

* Guh merge conflict

* guh

* pipe layer

* pipes

* Update delta.dmm

* Shit my shoes are untied

* Update delta.dmm

* catewalks

* fixed what warriorstar-orion suggested

* git reset --hard HEAD~1

* fixed what warriorstar-orion commented

* guh random sign

* Fixed what S34N suggested

* added two things

* fixed a oopps

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-06 14:02:22 +00:00
Zack
1dfd5cc056 fixed a windoor access on NSS Kerberos in cargobay (#23561) 
* fixed a funny

* fixed a thing

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-06 12:59:25 +00:00
Zack
3c4c01778c Fix for metastation qm office's window tint button does not tint windows (#23451) 
* fixed name issues

* doors

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-06 12:55:33 +00:00
Zack
a2a93b731d swipers (#23448) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-06 12:49:44 +00:00
Zack
9c2775ba19 Fixes Quartermaster's office on other stations that doesn't have an Announcement Request console (#23444) 
* Bam people say stuff

* Fucked messed up the wording

* god damnt missed a few things

* fuck missed a bit more

* bam thing done

* for fuck sacks screw up

* bam

* Update cyberiad.dmm

* fix

* announcers to all the stations

* fuck sacks

* fixed a funny

* funny fix

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-06 12:41:30 +00:00
Zack
60433a70b6 QOL changes to NSS kerberos (#23439) 
* Rechargers

* Table in the kitchen

* Door access fixed in cargo

* Shutters with a button

* borg charger

* funny fix

* Recharger

* unfuck what I fucked

* stupid random shudder

* fun

* doors

* dam doors

* damn doors

* fixed access

* saved a person who fell

* damn I tripped

* Fixed a layer
 2024-02-05 21:41:43 +00:00
datlo
17e58231df Adds the pondering orb to the wizard den (#23861) 
* Pondering orb

* fix

* reset map

* map merge fix test

* Update centcomm.dmm

* Revert "Update centcomm.dmm"

This reverts commit 1ff1a91c80.

* Revert "map merge fix test"

This reverts commit 0b4a71a365.

* update map

* Apply suggestions from code review

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

* make ghostify more generic

* add proximity check

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-02-04 21:47:09 +00:00
warriorstar-orion
2944575968 ruins: remove all unnecessary varedits (#23846) 2024-01-30 14:46:48 +00:00
Zack
0e0c018aa1 damn (#23845) 2024-01-30 14:46:11 +00:00
Zack
0aa98118b0 Fixed the door access (#23434) 2024-01-30 14:37:55 +00:00
Zack
540f530f24 Fixed the paramedic not having access on NSS Kerberos Departures cycled airlock (#23438) 
* Moved some shit and fixed the door access

* funny

* camera

* fixed what Henri215 suggested

* fixed what Lewc suggested
 2024-01-29 18:21:06 -05:00
1080pCat
1649ba6cb3 gawd damn it ven (#23427) 2024-01-29 18:04:35 -05:00
Zack
a025980676 Fix Windoor at NSS Cerebron Arrivals Security Checkpoint public access (#23424) 
* Fixed a door access

* Removed some extra things that were not needed

* Removed a extra windoor
 2024-01-29 17:52:56 -05:00
Venuska1117
e8e51d2dc8 Fix lavaland necropolis walls. (#23816) 
* Fixed wrong necropolis walls.

* Fixed some missed walls
 2024-01-28 13:28:37 +00:00
Qwertytoforty
192b8224b8 Anomaly core modules for modsuits (#23154) 
* firewall

* shielded part 1

* WIP: Anomaly core modules for modsuits

* icons, vortex

* cryogrenade, nerfs teslawall

* message admins moment

* Update uplink_nuclear.dm

* rnd designs

* now uses the flayer icon state

* Apply suggestions from code review

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

* early returns, barricade types, and comments, oh my

* Apply suggestions from code review

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

* updates desc, remove comment, removes /hardsuit/

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 19:17:18 +00:00
DGamerL
db578cdc6f Makes food not a subtype of reagent holders (#23379) 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

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

* Update code/modules/food_and_drinks/food/foods/pizza.dm

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

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 19:00:02 +00:00
Aylong
4e76e777d9 Randomless Kirby plants (#23376) 
* Kirby randomless

* Whoops

* Whoops x2

* Maps Script & missing plant

* Spellcheck

* Plant eye fix

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

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

* double pipe fix

* errant sign removal

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-01-14 13:22:18 +00:00
ppi13
685a196adc Fixes disposals in security meta (#23346) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-01-14 13:01:57 +00:00
ppi13
51f0f15aec Fixes missing wires escape/arrivals telepads (#23349) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-01-14 12:56:45 +00:00
Contrabang
0849386a3a Maplint now prohibits var-edited grilles (#23331) 
* i love CI!

* WILL... IT... FIX?

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-01-14 12:55:26 +00:00