Commit Graph

146 Commits

Author SHA1 Message Date
DGamerL
af70eb78f5 Fixes some issues with the NSS Asclepius and Central Command (#21699)
* Fixes

* more chairs lmao

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-07-23 23:17:47 +01:00
Venuska1117
ede086a241 ... (#21560) 2023-07-23 22:25:55 +01:00
warriorstar-orion
018a3d99cf lavaland: remove null req_access varedits (#21544) 2023-07-22 11:11:56 +01:00
Qwertytoforty
55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769)
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
2023-07-21 15:56:00 +01:00
S34N
725b0e00a4 Widescreen lobby art (#21521)
* wide_art

* state_swap

* centralised-tweaks

* better code

* sdmm2 moment

* Update code/game/turfs/simulated/walls_indestructible.dm
2023-07-10 17:23:17 +01:00
warriorstar-orion
cbc8a10ac2 Fix an unnecessary pixel offset on gulag APC. (#21431) 2023-06-22 20:26:47 +01:00
warriorstar-orion
fb9df0b7f8 Centcomm: remove stacked windows/spawners. (#21383) 2023-06-21 23:31:42 +01:00
Evаn Summers
973d8e5f18 Centcomm wall rechargers now start upgraded (#21240)
* Centcomm wall rechargers now start upgraded

* Style tweak

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-21 23:29:03 +01:00
AffectedArc07
48b0210064 [READY] Widescreen (#20861)
* TM Needed - Widescreen

* A lot of fixes

* TM notice

* Feedback thread

* Minor tweaks

* Expans silicon view stuff

* Fix viewmods

* The preferential option

* Why were these global

* Fix clickcatch sizing, fix parallax issues

* Maybe fixes the runtime

* READY
2023-06-07 21:09:16 +01:00
Contrabang
9490be9c13 buffs nukies??? wow (#20637) 2023-03-26 11:54:29 +01:00
Henri215
397552b09e Fixes some plaques descriptions (#20387)
* Fixes some plaques descriptions

* S43N review and violence free plaque desc
2023-02-25 00:51:28 -06:00
Samman166
f915a1d614 Removes smoke cluster grenades (#20331)
* Removes smoke cluster grenades

* removes regular hellwater grenades
2023-02-15 21:17:35 +01:00
Ryan
7c3cd86f14 APC & Machinery Refactor + Local Powernets (#19991)
* local powernet and machine power refactor

* some fixes

* more tweaks + powerchange() refactor

* fixes var edited apcs on meatpackers.dmm

* fixes issue with power channels

* Reviews

* delta fix

* Update code/game/machinery/portable_turret.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>

* removed area power change proc

* damn morgues

* requested changes

* request changes

* deconfliction

* mapping fixes

* some fixes from TM

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-01-30 22:28:10 +00:00
warriorstar-orion
67c6813568 Fix varedited areas on Lavaland. (#20119) 2023-01-20 19:27:24 -05:00
Qwertytoforty
b90bb7bcb8 ERT / nukies can now choose any NON KARMA species (#20032)
* ERT / nukies can now chose any NON KARMA species

* hahah yeah better fix that from testing

* warning people about implant destruction

* spritare

* random species option

* Apply suggestions from code review

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

* Apply suggestions from code review

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-01-20 19:22:29 -05:00
Adri
579fd817c1 Adds disco light floor (#20109)
* Adds disco light floor

* Fixes tiles not stacking

* Fixes linter issue

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

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

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

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

* Update code/__HELPERS/lists.dm

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

* Replaces shitcode with simple solutions

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

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

* pick excluding

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

* pick instead of rand

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

* Simplifies the color change process

* forgor setting current_color

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

* proper autodoc format

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-18 21:39:46 -06:00
Qwertytoforty
b864c95dcf You can no longer redirect the mining / labour shuttle when it is moving (#20083)
* You can no longer redirect the mining / labour shuttle when it is moving

* Sirryans changes

* done
2023-01-13 16:32:23 -05:00
Charlie
2f334c7a7e 3rd place toolbox win (#20124) 2023-01-10 21:24:46 +01:00
Henri215
1bdc60de9d Tweaks to Vendomat and Artvend (#19967) 2023-01-05 12:23:19 -06:00
Daylight
9ea1b569bb Adds Engineering Storage to Special Operations (#19910)
* Adds CC Engineering Storage

* Special Operations instead of SpecOps

* Totally didn't put a hole in the Gamma armory
2023-01-03 17:49:01 -05:00
AffectedArc07
1feb9fbd38 [READY] Atmos Refactor Part 7 (I think) - Kills signals + TGUIs stuff (#19867)
* I AM NOT A KING. I AM NOT A GOD. I AM LUNACY.

* THE SCOPE CREEP

* This was done in vi. No langserver. Send help.

* Progress

* Some issues fixed

* The code builds, but the maps dont

* CC builds, I doubt anything else does

* Do this now

* Safety

* The map compiles

* THE MAPPING HELL

* Airlock controllers dont work

* Fixed bombs

* AND THATS FIXED

* Phantom edit

* Restores LL I think

* The mapmerge hooks are actually retarded

* Fixes spawners

* Half working air control

* Picky

* Hyper efficient tank monitor

* Sanity

* Laying the framework

* Improved alert console

* Dont think this is actually done anywhere

* Metering

* ONE HUNDRED AND ~~EIGHTY~~ TWENTY SEVEN

* WE ARE READY FOR BOX TO BUILD

* One map done

* Well that was easy

* Another one

* I think this is done

* I should have removed this

* I would make a russian joke but <current event>

* Delta WIP

* Makes delta work

* Early review

* TM safeguard

* oops

* METAAAAAAAAAAAAAAAAAAAAAAAAA

* Fix #4213

* Trailing

* oh for piss sake

* Shutter fix

* Roundstart ATs can go away

* Review pass 1

* What could go wrong

* BOOM BOOM BOOM

* Not needed

* Fix seed vault

* Oops

* Review changes
2023-01-03 20:59:35 +00:00
S34N
27e5e4011b Allows admins to spawn a nuke with the DS (#19872)
* Lets DS spawn with a nuke

* OOO

* removes this unused code
2022-12-27 18:14:51 -06:00
Venuska1117
8abf7e47a9 Fixing Door names (and other stuff) at new Lavaland outpost. (#19879)
* Changed names of doors whith have "Maintence" to "Maintenance" (missing 'an' in it)

* Fixed floor dirt inside wall...

* Fixes lavaland labor and outpost.
Fixed Labor camp power cable, now reach generator propertly.
Fixed Labor camp air scrubber, now it have universal adapter to work.
Changed Windows from normal to reinforced, i dont know how i miss that.

* Next Fixes!
- Restored Door names, now they are named correctly
- Removed "random barricade" icon showed barricade, but in code it spawned locker door or wall (with make issues) so it got removed.

* Changes in lavaland file
- Added missing cables in labor camp, i forgot about them after i cleaned cables.
- Changed "Mech bay Airlock" to "Mech Bay Airlock".
- Now escape "solo" from labor camp is more easy now than before.

P.S. i forgot to mention in previous update about labor escape, now its fully spoken here.

* Just removed few pixels, so now lava is 2 gap wide like before.
2022-12-19 14:33:57 +00:00
S34N
73138a83c5 Fixes weird smoothing (#19876) 2022-12-13 16:50:47 +00:00
Venuska1117
7910e28969 New Lavaland Outpost (First Time Mapping) [ReAdded] (#19769)
* Fixing all stuff and drop only lavaland file

I repaired whole branch, and now i drop lavaland file without changing other map files

* Changes

Lavaland shuttle got changed to more sphear shape
Deleted duplicated freezer in outpost medbay

* Fixed Cameras

Now All Cameras are named and display on mining camera console.

* Changes Suggested by S34NW

-

* Changes Suggested by S34NW (with description)

- Added APC to Medbay, Mechbay and Ore Processing.
- Replaced Normal Freezer with IV Freezer.
- Deleted and make new light switches with prefered 24pix offset.
- All cameras are double checked, and all have correct path for monitor console from previous upload.
- Deleted all previous APC's and repleced them with newly named ones with prefered 24pix offset.
- Changed Mechbay Charging port to sprites.
- Fixed all Areas missplacement and added 2 new ones: [Cafeteria] for dinner room and [Mining Storage] for lockers and crates.
- Added missing "power cable dot" under one of generators.
- Changed position of Shuttle Airlock to be closer to shuttle and moved it to "glass" category.
- Added tiny space near locked chest.

- Still waiting for Pull: https://github.com/ParadiseSS13/Paradise/pull/19820 to get merged.

* Changes after Catwalk Merge

- Added New Catwalk from pull: https://github.com/ParadiseSS13/Paradise/pull/19820
- Changed some outpost shapes and thickness... a little, so now antags with 200IQ  can use them for their advantage.
- Re-Added removed "Lava island", now its accessable by using jump boots (not only by fire-fighter) [i wish it was like special island full of ores in every bit].
- Increased lava distance a little between labor camp and mining outpost.
- Changed rocks around station from "[...]/mineral/random/volcanic" to "[...]/mineral/random/lava_land_surface" because i wanted to avoid gibonite spawn and players mining rocks around.... they are for look and antags use, not miners.

* Added Manually Grille's

When grilles appeared, they were always "heavy damaged" so from now, they will be always build in specific spots.

* Next Changes from S34NW suggestion

- Light Switches now face specific directions.
- Fixed and added APC's.
- Moved web to correct place.
- Removed some walls from double wall.
- Now cameras in c_tag have "Mining Outpost - (section name here)".
- Added missing cable dot under terminal.

* More Areas types

- Added Mech bay area
- Added airlock area

* Another Small Changes

- Removed Air alarm in wooden crate storage
- Added "Base Turf Editor" to each area

* FINALLLY FIXXXEEEEEED

* Updated Airloc access level required
2022-12-07 22:23:26 -06:00
Contrabang
b304476ca4 Fixes the Nukies's tool vendor being paid (#19777)
* free tools

* SST too
2022-11-26 13:59:13 -05:00
Henri215
9aa8a5eb69 Tweaked/Added BODA vendor to perma and labor camp (#19705)
* perma and boda content tweak

* deconsflict map
2022-11-26 13:28:26 -05:00
Henri215
86d99bfc4a Converts multiple warning signs into proper structures instead of varedits (#19381)
* external airlock signs

* high voltage

* radioactive area sign
2022-11-21 20:14:31 -06:00
Sirryan2002
61145a02f8 [TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209)
* initial edits

* initial edits

* converting shit over to machinery/economy

* vending and mapping fixes

* vending fix pt.2

* Converts Supply Economy to Use Space Credits instead of Supply Points

* Job Payment, NanoBank, and Paychecks

* clothing type path fixes (damn merge conflicts)

* fixes map typepath issues

* adjusts supply prices

* Vendor Price Adjustments

* account uplink terminal tweaks

* please pass tests

* Apply suggestions from code review

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

* reviews and bug fixes

* Review Suggestions/Fixes and Request Console Rewrite

* edits

* vending changes for merge

* typepath fix

* final tweaks

* proc ref fixes

* Fixes and Tweaks from 2nd TM

* rebuild TGUI

* final tweaks

* Apply suggestions from code review

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

* requested reviews

* tweaks

* updates slot machine winnings

* fixes

* GC fixes

* fixes

* oops. still need to deconflict this

* Apply suggestions from code review

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

* requested changes and bug fixes

* atm runtime fix

* requested reviews

* vend act stuff

* attempt to pass tests

* supply packs fix

* user tochat -> debug log

* FINAL FIXES

* removes CC db stuff

* Apply suggestions from code review

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-11-21 23:30:50 +00:00
S34N
be91fdc0b8 Wizard den remap (#19575)
* wiz den refresh

* brass and wood

* final tweaks

* wrong door

* mira
2022-11-15 18:59:10 -06:00
Luc
3e40b051de Slightly optimizes admin surgery room (#19415)
* Slightly optimizes admin room surgery

* Add some bumps
2022-10-21 12:37:14 +01:00
S34N
8ef5c698d6 New newscaster sprites [MAPPING CHANGES] (#19252)
* map

* PR number

* master maps

* re-apply changes

* manually stop that shuffle
2022-10-15 11:30:56 -05:00
ElorgRHG
e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
S34N
41813c3e5f Various fixes and QoL tweaks to labor camp (#18841)
* gulag QoL fixes

* escape route, analyzer

* stops people from spam calling the shuttle down

* unifies access

* moves ofitser, fixes point claim console

* TGUI build

* unifies point system for good

* TGUI deps

* tweak

* sirryan review

* hard ref removal

* more changes

* scope creep scope creep

* sirryan!
2022-08-25 16:36:36 +01:00
AffectedArc07
aba452f785 Refactors signallers, assemblies, electropacks (#18689)
* Refactors signalers, assemblies, electropacks

* Update code/game/objects/items/devices/radio/electropack.dm

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

* Apply suggestions from code review

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-08-15 16:36:34 +01:00
Adri
b7c2084cc1 Moves mining GPS into their storage units (#18663) 2022-08-02 14:31:57 +01:00
AffectedArc07
2da68e9b64 Atmospherics refactor (#18460)
* Atmospherics refactor

* META(GAMING)

* Cleanup

* RPD hotfix

* Fox review

* Do this

* Well that escalated

* Repath these

* Ah yes, scope creep

* Remove this comment

* Regression #1
2022-08-01 16:27:35 -04:00
Adrer
1501e85945 Fixes invisible closet in wizard's den (#18569)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-07-26 15:43:38 +01:00
LightFire53
fc669e4696 Adds Robotic Storage to Central Command and Reduces CC Toxicity (#18515)
* Rock-a-bye Borgi

* Makes floors less nitrogen

* Silent but sleepy
2022-07-26 15:42:00 +01:00
Farie82
b5c9a3bc79 Makes the lavaland shuttle not spawn space when destroyed. Makes shuttles not take space/lava/chasms with them on transit (#18194)
* Makes the lavaland shuttle not spawn space when destroyed
Makes shuttles not take space/lava/chasms with them on transit

* Ensures damaged shuttle turfs still can be repaired after launch
Makes sure flooring has proper icons set
2022-07-15 18:53:03 -05:00
Sirryan2002
f2813a6730 Complete Library Overhaul Part 1 (#17832)
* first edits

* more commits yay

* more changes

* Update paradise.dme

* changes

* more edits

* more edits

* changes

* more changes

* changes

* more stuff

stuff

Update tgui.bundle.js

* FUCK

* Many UI changes

* Update Lib Computer UI and Correct Map Issues

* squashed commits :)

Guts Old Book/Manual Code and Reworks it
final (almost) touches

* this should pass tests now

* fixes random ruin having a removed object

* adds review suggestions

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

* squashed commits :)

update schema
adds python requested changes
implements proper python & sql scripts
applies some requested changes + minor fixes
bump SQL version to 40

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Apply suggestions from code review

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

* applies requested changes from code review

* lets pass some tests today

more fixes

* Apply suggestions from code review

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

* more requested changes fulfilled

* should fix map issues + a couple other things

* fixes & sanitization stuff

* Apply suggestions from code review

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

* updates UI and implements more requested changes

* mother of bug fixes & UI cleanup

* removes unused code

* Apply suggestions from code review

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

* fixes

* adds GC checks

* Apply suggestions from code review

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

* requested changes + TGUI Cleanup and Styling

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-09 14:55:12 +01:00
Vi3trice
8753e22a8e Rework toy card decks into standard decks (#17925)
* Go fish

* Keep forgetting about the map

* Forgot about the sprites for the double deck

* Cleaned things up

* Fix icon conflict

* Update cards.dm

* Improper tweaks

* Update cards.dm

* Axing the popup from the toy version entirely, that was a little jank

* Meta remap was merged

* Huh. \improper was the issue.

* Update cards.dm

* Few changes and a fix

* More changes

* Update cards.dm

* Update cards.dm

* Update cards.dm

* Merge branch 'master' into go-fish

* Update cards.dm
2022-06-27 22:38:15 +01:00
Contrabang
491e2c3459 putting some nanopaste on the phazon wreckage (#18041) 2022-06-23 18:03:09 +01:00
LightFire53
52a2a90966 Fixes Area Shenanigans on Labour Camp, Derelict 5, and CharlieStation (#17987)
* Area tweaks

* Update oldstation.dm

* When you are Near Space

* 2 missed lattices...

I love catching things I missed in a screenshot...

I need a finer comb.
2022-06-17 12:19:23 +01:00
S34N
1910d4cb37 Removes instances of rusty turfs (#17980)
* removes instances of rusty turfs

* and this
2022-06-16 20:52:06 +01:00
Bm0n
0b3a8c074c fans (#17904) 2022-06-06 21:52:31 +01:00
GuiltyNeko
7dfb9f15b6 Update centcomm.dmm (#17793) 2022-05-27 21:13:15 +01:00
S34N
240c738e2b Gamma armoury balance (#17495)
* cc fixes, gamma armoury changes

* reverts the fixes

* how did these change, who knows, here's a revert anyway

* merge master

* what the hell am i doing, i dont know

* fixes weird lathe stuff
2022-05-03 04:38:34 +01:00
AzuleUtama
0f3133eb25 Fixes certain Nuke Ops bundles using the wrong duffelbag sprite (#17717)
* sprites updated

* removes redundant icon/item states
2022-05-03 04:24:16 +01:00
S34N
8404fe134c yeets this turrent (#17706) 2022-05-02 22:01:27 +01:00