Commit Graph

1487 Commits

Author SHA1 Message Date
Luc
327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

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

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
Silverplate
69cb1624ad HOTFIX: event B3 no longer nukes the SM (#22131)
* Fixes Event B3

* duration fix
2023-08-26 16:26:25 -05:00
GDN
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
Silverplate
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
Silverplate
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
Silverplate
76d0428022 I hate pyro slimes (#21977) 2023-08-21 18:39:50 +01:00
Qwertytoforty
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
GDN
6eb57a98c7 fixes ais being unable to use cameras after an emp sometimes (#21974) 2023-08-16 20:45:10 +01:00
Luc
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
larentoun
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
Charlie
10d55cb1fe fix (#21884) 2023-08-05 01:18:56 -05:00
Contrabang
4c3180ff21 Migrates meson stuff FULLY to traits (#21609)
* fuckin TRAITS

* pickup -> equip
2023-07-17 10:53:47 +01:00
DGamerL
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
Qwertytoforty
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
Luc
b1565a36e9 Revert "Allows for the gravity generator to be cmagged. (#20944)" (#21493)
This reverts commit 7115eca62e.
2023-06-27 22:13:18 -05:00
Luc
7115eca62e Allows for the gravity generator to be cmagged. (#20944)
* Add gravgen cmag interaction

* Bump cmag cooldown

* Add some checks for power state

* Sean review
2023-06-22 20:53:23 +01:00
Burzah
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
Qwertytoforty
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
GDN
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
Burzah
9d0fad1a41 TGUI - Turbine (#21226)
* TGUI Turbine port

* Apply suggestions from code review

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

* TGUI data and operational change

* If check for compressor and turbine

* another if check

* tgui fix progress

* small adjustment to resolve

* oops... missing semicolons

* progress update, reconnect needs to be fixed

* small adjustment to const TurbineWorking

* Apply suggestions from code review

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

* adjustments to resolve conversations

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-14 21:14:08 +01:00
Octus
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
DGamerL
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
DGamerL
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
Vi3trice
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
Qwertytoforty
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
Ryan
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
Luc
d8ddda378b Deadchat Plays SS13: Ghost Control of Mobs (#20600)
* Add dchat control

* adds human support, cleans other things up

* Bit of cleanup

* actually use the item

* minor proc ref mistake, laugh at this user

* evil tg strings

* Renames defines, adds vv menu item for it

* Improve anarchy message formatting

* don't go to_chatting tesla energy balls

* aa review

* Minor cleanups, replace some emotes

* Addressing some reviews

* Incorporate some checks for deadchat mutes/prefs
2023-05-21 12:33:11 -05:00
Luc
b2fa6060f6 Adds ghost notification when the singularity is (likely) loose. (#20826)
* let you know when it's (probably) loose

* better checks

* guh

* bwaaah

* Update code/modules/power/singularity/singularity.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-22 09:29:32 +02:00
1080pCat
d315a74ca5 Adds a funny little message if you focus too hard on a singulo/teslo (#20815)
* tele thingy

* grammar!

* new singulo message

* clasuse guarded (and more grammar)

* grammar, indentations, removes a useless return

* Update code/modules/power/singularity/singularity.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-22 09:29:02 +02:00
ppi13
bcbce645b1 Allows human mobs to alt+click to unlock APC and Air Alarms (#20742)
* alt+click to unlock airalarms and apc

* Update code/modules/atmospherics/machinery/airalarm.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-04-22 09:18:31 +02:00
Coolrune206
7293b7ecbd Allows admins to freeze the SM (#20616)
* allows admins to freeze the SM

* Hal9000 Review

* now works better than deleting frozen mobs!
2023-04-13 16:37:18 +02:00
unknownuser782
f28f14d90b Distinguish between plating turf layer and floor turf layer. (#20503)
* move plating layer

* atmos correctness pass

* transparent floor ordering and wire terminal stuff

* fix control flow spacing
2023-03-26 12:25:08 +01:00
Luc
6bf5172bec Fix SM (and some other) follow links (#20554)
* hoopefully fix SM message tracking being really weird

* update some more follow targets

* Apply suggestions from code review

hehe

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

* Cleans up some loose ends, implements for arrivals announcer too

* Changes target to the new deactivated core

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-03-26 12:17:37 +01:00
GDN
5557f6ae32 Nukes detailed examine (#20314)
* Nukes detailed examine, converts to normal examine stuff

* THE SHOOTENING

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

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* oop

* Update code/modules/mob/living/silicon/robot/drone/maint_drone.dm

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

* Update code/modules/power/apc/apc.dm

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

* Update code/modules/projectiles/guns/energy/nuclear.dm

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

* bam

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-03-17 16:20:53 -05:00
GDN
71de6caeed fixes borgs not being able to use APCs (#20611)
* fixes borgs not being able to use APCs

* also this
2023-03-12 14:55:54 -06:00
GDN
d0898bb256 makes APCs gc and fixes an APC destroy issue (#20478)
* makes APCs gc and fixes an APC destroy issue

* Update code/modules/power/apc/apc.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-08 07:00:20 +00:00
GDN
c294037c74 fixes ais being able to control apcs with ai control off and borgs runtiming when attempting to do so (#20443)
* fixes ais being able to control apcs with ai control off and borgs runtiming when attempting to do so

* Update code/modules/power/apc/apc.dm

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

* Update code/modules/power/apc/apc.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-07 22:23:55 -06:00
GDN
201bb2bb3b fixes overhealing exploit (#20489) 2023-02-24 18:14:05 -06:00
Adrer
5098d1db5e Gravity generator icon properly reflects its state on roundstart. (#20412)
* Gravity generator updates icon on initialize

* Use set_power instead of update icon

* Fixes Restore Power Routine

* Revert "Fixes Restore Power Routine"

This reverts commit 5e17dc33f2.

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-02-21 21:04:55 +00:00
S34N
ece09782ec emergency lights now turn off after 2 minutes, not 10 (#20228) 2023-02-14 20:31:00 +01:00
AffectedArc07
b34e8fa301 [READY] CI now bans files with the same name (#20195)
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
2023-02-04 16:33:41 -06:00
Charlie
c5d7250c66 Projectiles now orbit blackholes (#19999)
* orbit

* I HATE ANGLES I HATE ANGLES I HATE ANGLES

* PERFORMANCE

* ready to merge
2023-02-03 22:36:06 -06: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
Luc
9ba005de9f Add themselves as a pronoun helper, fixes some usages of it (#20184)
* Add themselves helper

* Testing and replacing

* Fixes some non-standard usages
2023-01-20 19:28:48 -05:00
Qwertytoforty
cc1de516ad Emagging a pacman does something once again. (#20179)
* I hate tgui

* sirryan changes

* tgui.png
2023-01-18 22:37:16 -05:00
GDN
860b2e5334 fixes a nar-sie runtime (#20203) 2023-01-15 18:04:39 -05:00
Qwertytoforty
33d937feb8 Removes the part of apc losing malf points on apc deconstruction I missed (#20091) 2023-01-06 22:11:50 +01:00
Qwertytoforty
61eefd625e Gravity generator is now more radioactive to people when turning on or off (#20001) 2023-01-06 21:56:58 +01:00
Charlie
8ef4aa727e Adds Shadow demons (#19732)
* reshuffle

* shared base type

* moves this to the base type

* the monster

* event

* FUCK

* better sprites

* refactors bloodcrawl, more nice sprites

* review stuff

* Apply suggestions from code review

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

* heart of darkness

* pre TM tweaks

* ARGH

* hopefully fixes double hits

* tweaks

* derp

* tweaks

* TEMP RUNTIME REMOVE LATER

* fixes

* runtime fixes

* cig runtime fix

* review + another runtime fix

* re adds sprite

* removes runtime

* oop I forgor

* DRUNK CODING

* SPRITES

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-12-29 11:26:37 -06:00
AffectedArc07
e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006)
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
2022-12-29 14:28:40 +00:00