Commit Graph
76 Commits
Author SHA1 Message Date
BjamchamandGitHub 05880974f6 You can no longer stack Rad Collectors on the same turf (#22317)
* Stack wrenching begone(questionable code edition)

* Review round one, I am blind

* The expected rewrite
2023-09-13 18:02:01 +01:00
aaad2a5aba Adds the Oblivion Enforcer wizard loadout (#21920)
* initial addition

* adds wall/airlock obliteration
this definitely needs to be tuned a bit numbers-wise

* adds TRAIT_SUPERMATTER_IMMUNE & gloves

* adds more checks for the supermatter immune trait

* removes SM tongs logic from the halberd
Realistically, you would never actually have the halberd and tongs

* makes slivers bulky

* dusting downed people
also removing a useless assigned variable i missed

* adds the (incomplete) loadout

* halberd buff

* adds robes + sprites

* oops

* halberd icons

* knockdown

* stuff

* timer shortening

* species sprites part 2

* animation for dusting walls

* Apply suggestions from code review

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

* early return

* parry numbers!

* Update code/modules/power/engines/supermatter/supermatter.dm

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

* dgamer review

* dgamer review + no more pulling

* reverts early return thingamajig

* Update code/modules/power/engines/supermatter/supermatter.dm

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

* removes `get_turf`

* hal review pt 1

* hal review pt. 2

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

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

* `carve_sliver` proc

* unfucks icons

* Apply suggestions from code review

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-09-10 22:15:12 +01:00
DGamerLandGitHub 58f4cdf9c5 [s] Fixes some investigate admin stuff that was missing (#22294)
* Guh

* Kills off storing logs in a var

* GDN review
2023-09-08 20:14:13 -05:00
ContrabangandGitHub 65ab4a5d89 Refactors station areas to be /area/station subtypes (#21681)
* areas

* progress...

* death hatred and murder

* get current master maps

* hoooly shit i can load up the maps

* it compiles now

* map changes

* fixes some unintended stuff

* make the .dme right

* fix mixed space+tab indents

* more space-tab fixes

* CI, please show me more than 1 CI fail at a time

* UPDATE PATHS!!!

* none of the stations had it anyways, but fixed

* mint wasnt actually deleted, my bad

* epic random CI fail for no reason

* i beg you, CI

* dont delete anything

* okay THAT should work now

* okay get master maps and rerun

* okay THEN run update paths

* actually done now

* oops
2023-09-06 17:37:50 +01:00
matttheficusandGitHub 0c17a3c4f7 Engineer Scanner Goggles on Radiation Mode Prevent SM Hallucinations/Singulo Staring (#22069)
* here we go!

* singulo too

* contra review

* contra 2
2023-09-01 23:12:17 +01:00
SilverplateandGitHub 69cb1624ad HOTFIX: event B3 no longer nukes the SM (#22131)
* Fixes Event B3

* duration fix
2023-08-26 16:26:25 -05:00
GDNandGitHub 0c4e40fbf8 makes sm events not chain together in rare cases (#22130)
* makes sm events not chain together in rare cases

* this too
2023-08-26 14:57:25 -05:00
SilverplateandGitHub 3536cbd795 HOTFIX: 2 SM event runtimes, 2 instances of unintended behavior (#22074)
* Fixes things

* SM now qualfies as started when done so by gas

* FIxes CI issue

* Reworks event A-2 to fix a runtime.
2023-08-25 16:01:03 +01:00
8d6cfbd418 Adds supermatter events (#21406)
* Class D and C SM events

* see above

* B-Class events

* A-class events

* S-class events (ebents done)

* Start of console

* datumization p1

* supermatter_event

* beginning of tgui

* adds new circuitboard for anomaly monitoring

* more supermatter event code

* forgot to change last_events

* tgui progression

* fix the freakin errors

* forgot to move this to on_start()

* some small fixes - tgui stuff to change

* bug fixes

* TGUI take two - in progress

* TGUI and circuit board removal for anom console

* Fixes world time spamming events

* S class event fix

* Fixes D class events

* Fixes worldtime based event calling

* Apply suggestions from code review

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

* ACTUAL logging

* I blame copypaste

* Goddamit

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Burzah <mbsx@proton.me>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-22 21:48:13 +01:00
SilverplateandGitHub 76d0428022 I hate pyro slimes (#21977) 2023-08-21 18:39:50 +01:00
QwertytofortyandGitHub 195800fd59 supermatter gets darker as it delams, rather than brighter, below 50% it darkens the area (#21639)
* supermatter gets darker as it delams, rather than brighter, below 50% it darkens the area

* invert logic

* removes excess lines

* removes else and returns

* fixes bad return
2023-08-16 20:48:23 +01:00
LucandGitHub d75d20b907 Makes things dust when the SM bumps them as well (#21677)
* Add bump

* nah

* Add examine text to note it can be wrenched safely.
2023-08-16 19:52:38 +01:00
larentounandGitHub 4efc40ccac [FIX] Jobbaned can't spam-spawn as cult harvesters (#21656)
* fix: jobbaned can't spam-spawn as cult harvesters
https://github.com/ss220-space/Paradise/pull/1283

* fix: oops, what is this check?

* smoke needs create_smoke
2023-08-16 19:50:21 +01:00
CharlieandGitHub 10d55cb1fe fix (#21884) 2023-08-05 01:18:56 -05:00
ContrabangandGitHub 4c3180ff21 Migrates meson stuff FULLY to traits (#21609)
* fuckin TRAITS

* pickup -> equip
2023-07-17 10:53:47 +01:00
DGamerLandGitHub b77f369160 Changes the Tesla movement pattern [READY FOR REVIEW] (#20955)
* Slightly buffs the atmos backpack
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## What Does This PR Do
Increases the water cap of the atmos firefighting backpack from 200 to 500, to be more in line with the janitor cleaning backpack
<!-- Include a small to medium description of what your PR changes. -->
<!-- Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! -->
<!-- If your PR fixes an issue, add "Fixes #1234" somewhere in the PR description. This will automatically close the bug upon PR submission. -->

## Why It's Good For The Game
Currently, nobody uses the backpack for anything other than metal foam, as the water capacity is simply too little for any effective firefighting, or nanofrost usage.
<!-- Add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## Testing
<!-- How did you test the PR, if at all? -->

## Changelog
🆑
tweak: Increased atmos firefighting backpack capacity
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- If a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. -->

* Maybe actually do what the PR says

* First attempt

* First stepos

* Cleaning up a bit, no errors :D

* fuck I have to redo the entire move code

* probably  won't compile, but I make other PR now

* something is fucky but I'm not fixing it now

* BALL STUCK BALL STUCK

* we making progress

* guhhhh

* moving over to getline() stuff

* yeetus your APCs are deletus

* removes variable that made Cl fail

* Steelslayer suggestions

* hotfix number one

* ANOTHER hotfix

* lewcc reviews

* new findeventarea proc

* Steelslayer review + Almost 100% sirryan review

* this should be all done now

* Hal review

* now 100% CI approved

* Hal review

* no more turf refs

* begone unused lists

* maybe actually delete the list

* doesn't runtime :D

* oops forgot this

* list gone and less runtimes

* steelslayer reviews
2023-07-15 11:11:14 -05:00
QwertytofortyandGitHub 90c2384dd9 Supermatter slivers (cut off from the SM) have a slightly glowy ray effect to them, and soul shards (#21261)
* she supers my matter till I delam

* incorrect delamination alarm

* now soulstones glow to make them  not get lost

* Helper proc, also fixes supermatter visual bugging out on high mole pressure

* moved
2023-07-12 20:24:34 +01:00
f8fb66d84a [TGUI] Particle Accelerator (#21370)
* TGUI Particle Accelerator - First Pass

* interface_control wire check

* Update tgui/packages/tgui/interfaces/ParticleAccelerator.js

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

* Apply suggestions from code review

Adding in the gray out for the buttons.

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

* formatting and margin fix

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-06-21 23:13:44 +01:00
QwertytofortyandGitHub 01b09bf3e8 You can no longer get the supermatter sliver objective if the station does not have a supermatter (#21337)
* You can no longer get the supermatter sliver objective if the station does not have a supermatter

* sirryans changes
2023-06-21 22:55:39 +01:00
b05e27bb17 Adds summon supermatter, a new wizard spell (#21096)
* Devious intent

* bam

* also this

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

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

* now a shard

* Update code/datums/spells/summon_supermatter.dm

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

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

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

* improved code

* log name removal

* good enough

* conflict

* sprite by mcramon

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-06-15 19:16:47 +01:00
OctusandGitHub 98ddced488 Explorer Overhaul and Gateway Retirement (#20855)
* Adds Explorer spawnability, removes Cyberaid gateways

* deletes some REALLY old bloat maps and deletes Gateway.dm

* Fixes runtime, and removes more stuff like gateway config... cause we dont have a gateway anymore

* removes all mention of /obj/machine/gateway

* Goodbye test_tiny and evil_santa 😈

* removed a literal fucking pamphlet

* changes map area name from Gateway to Expedetition

* changes the access from ACCESS_GATEWAY to ACCESS_EXPEDITION

* Revert "Goodbye test_tiny and evil_santa 😈"

This reverts commit eda775ecd5.

* ok deletes evil_santa only

* Fixes a runtime

* Adds new visuals for new area and explorer spawn marker

* Unhides explorers from the pref menu

* adds spawns and fixes the gateways for all maps, adds Expedition room to Cere

* improves and cleans up the expedition room maps, also clothes for Explorers

* GET OUT OF HERE EXAMPLE.

* byebye button
2023-06-03 15:22:37 -05:00
DGamerLandGitHub 173bfb92f5 Removes bio resist from the code (#21108)
* BIO armor is kill

* some more stuff that uses bio resist

* I did a scuffed merge conflict solve but it works
2023-06-03 09:50:22 +01:00
DGamerLandGitHub 810984f700 Fixes a few small spelling mistakes in the SM examine (#21198)
* Spelling mistake is kill

* even more typos
2023-06-02 20:01:50 -05:00
Vi3triceandGitHub 47f1cc87f6 Sets the SM layer to be above normal mobs (#21106)
* If you're below the sm layer, you'll probably get dusted.

* Update supermatter.dm
2023-06-02 19:56:53 +01:00
41a250c4a3 Ports TG supermatter effects / warp effect (#20808)
* [WIP] Ports TG supermatter effects / warp effect

* remove this as it doesnt work

* also remove this test

* Now with real pulsing effects!

* smoother animation

* adds effect to gravity generator / bsg

* Apply suggestions from code review

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

* Move to effect, singularity has effect

* remove effect from size one singularites / narsi

* now works through walls, yipeee

* merge conflict return I did not want

* Apply suggestions from code review

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

* Bug fixes and visual tweaks

* Apply suggestions from code review

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

* Update plane_master.dm

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-06-01 14:29:00 -05:00
11717823df Power Code Cleanup + Conversion to Regional Powernets [Refactor Only] (#20598)
* initial edits

* more cleanup, yipee

* moving shit around

* dme fixes

* fixes file ticking issue

* more dme fixes + duplicate files???

* Apply suggestions from code review

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

* glass floor fixes

* Apply suggestions from code review

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

* requested reviews

* the most painful bugfix of my life

* forgot to remove some debug stuff

* fixed issues with excess power

* fuck powernets (fix)

* Update code/modules/power/powernets/README.md

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-05-31 20:55:10 -05:00