Commit Graph

25566 Commits

Author SHA1 Message Date
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
BiancaWilkson
edef576f2e Martial arts now use a weight system to determine which one is active (#21037)
* martial arts have a weight system now

* remove unneeded variable

* carp cannot be deactivated once learned

* i love documentingtation

* krav can no longer delete other combos

* now ill be embarassed if i dont make it better

* i know how istype works i promise

* implement sirryan's changes

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-03 00:24:42 -05:00
GDN
30cd47b94a converts the hide verb to an action button (#20459)
* converts the hide verb to an action button

* Update code/modules/mob/living/carbon/alien/larva/larva.dm

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

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

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

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

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

* Update code/modules/mob/living/simple_animal/hide_action.dm

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

* tweak

* what a thrill

* bam

* what a krill

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-03 00:16:40 -05: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
Qwertytoforty
8e6ed2f284 [serious april pr pls no close] Adds the magic nanny bag. (#20774)
* IT'S NOT A GRANNY BAG

* other tweaks to put out

* Restricted on raging

* Update code/game/objects/items/weapons/storage/backpack.dm

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

* defined

* Update code/game/objects/items/weapons/storage/backpack.dm

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

* changes requested

* no slime coring the super food

* actually let the pie live, the meds can be found in pill bottles in space, just not the steak

* merge conflict bullshit

* pain, suffering even

* icon handling

* M-M-M-ERGE CONFLICTS MY BELOVED

* Apply suggestions from code review

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

* s34n comments

* I can read and speak the english language™️

---------

Co-authored-by: Henri215 <77684085+Henri215@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-06-02 15:49:26 -05:00
Contrabang
3f87165a03 CI now bans files with the same name (PART 2) (#21051)
* CI change

* world.dm

* .dme world.dm

* subsystem renaming

* .dme for subsystems

* ai_laws.dm

* armor.dm

* emote.dm

* logging.dm

* spell.dm

* air_alarm.dm

* crew.dm

* decal.dm

* emissive_blocker.dm

* footstep.dm

* spawner.dm

* fire.dm

* carbon.dm

* living.dm

* mob.dm

* movement.dm

* thermal_drill.dm

* plasmamen.dm

* lavaland.dm

* chaplain.dm

* lightning.dm

* magnet.dm

* mimic.dm

* wizard.dm

* morph.dm

* vampire.dm

* click.dm

* self.dm

* radiation_storm.dm

* airlock.dm

* autolathe.dm

* mulebot.dm

* nuclearbomb.dm

* particle_accelerator.dm

* smartfridge.dm

* syndicatebomb.dm

* vending.dm

* wires.dm

* sound.dm

* mining.dm

* syndicate_space_base.dm

* monkey.dm

* guardian.dm

* bomb.dm

* standard.dm

* nuclear.dm

* pinpointer.dm

* access.dm

* departments.dm

* job.dm

* science.dm

* buttons.dm

* cloning.dm

* igniter.dm

* wishgranter.dm

* atmos_control.dm

* message.dm

* power_monitor.dm

* mecha.dm

* combat.dm

* mining_tools.dm

* meteors.dm

* spiders.dm

* contraband.dm

* aliens.dm

* uplinks.dm

* voice.dm

* intercom.dm

* lights.dm

* robot_items.dm

* mineral.dm

* dice.dm

* extinguisher.dm

* paint.dm

* signs.dm

* staff.dm

* smokebomb.dm

* boxes.dm

* random.dm

* janicart.dm

* statue.dm

* cargo.dm

* asteroid.dm

* headslug.dm

* fulton.dm

* atmospherics.dm

* pump.dm

* corpse.dm

* oldstation.dm

* gps.dm

* preferences.dm

* clothing.dm

* ears.dm

* glasses.dm

* boxing.dm

* color.dm

* renames ninja gear files

* recipes.dm

* error_handler.dm

* anomaly.dm

* floorcluwne.dm

* undead.dm

* overmind.dm

* shield.dm

* bottle.dm

* organ.dm

* piano.dm

* plasma_fist.dm

* language.dm

* mob_defines.dm

* mob_helpers.dm

* damage_procs.dm

* _defines.dm

* empress.dm and queen.dm

* brain.dm

* organ file renaming

* subsystems.dm

* constructs.dm

* bot.dm

* pet.dm

* nature.dm

* magic.dm

* colors.dm

* drugs.dm

* medicine.dm

* toxins.dm

* shuttle.dm

* surgery.dm

* moves a bunch of define files

* traits.dm

* names.dm

* other_mobs.dm

* flags.dm

* some final define files

* well turns out contractor_pinpointer.dm was  taken

* I forgot to remove this file

* how in the hell did this get unticked

* I DID INCLUDE IT, but there was a "w" there

* swaps the world definitions

* camera renamed to SScamera

* examine -> alien_examine
2023-06-02 14:30:17 -05:00
Luc
b4cba9f981 Minor deadchat control improvements (#21162)
* Add resist, improves attack

* Make emotes intentional too

* fix a qdel loop

* Add "help" command, start deadchat control with existing followers as well

* Minor messaging improvements
2023-06-02 20:12:10 +01:00
Taran
09132de5a6 Makes it so nano calcium always fixes broken bones, and IB and lowers weaken time (#21170) 2023-06-02 20:09:00 +01:00
Nathan Winters
1d21abbeeb Oil temperature reaction tweaks (#21201) 2023-06-02 19:57:40 +01:00
GDN
4621a8a05f morphs now show up the orbit menu antagonist section (#21145)
* morphs now show up on antaghud

* ismorph changes
2023-06-02 19:57:17 +01: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
Sam Albanese
7ae3947b41 Update human_hair.dm (#21192) 2023-06-02 19:53:59 +01:00
Sam Albanese
c5ba015f22 Update rdconsole.dm (#21190)
Fixes stack eating issue with destructive analyzer
2023-06-02 19:53:30 +01:00
Qwertytoforty
7c5c2f9117 empty ammo no longer runtimes on EMP (#21188) 2023-06-02 19:53:01 +01:00
Henri215
ef8d5d97b0 Fixes ghosts not being able to deactivate antaghud (#21180) 2023-06-02 19:52:53 +01:00
Vi3trice
77f37760e7 Make various machinery properly update their icons on init (#21177)
* All of those Inits, and you choose to not update

* Update requests_console.dm
2023-06-02 19:52:40 +01:00
HMBGERDO
99a2d9050b Biodegrade buff (#21118)
* removed cuff melting delay, added acid hand

* comments

* forgot about that

* cleanup

* comments cleanup

* code cleanup, signal unregister moved to hand object Destroy proc

* fix adminspawned runtimes

* cleanup
2023-06-02 19:52:25 +01:00
Burzah
65751dcf58 Oversight fix: Augment Surgery Limb Status Fix (#21172)
* augment surgery oversight fix

* comment update for logic check
2023-06-02 19:50:45 +01:00
Deckard Cain
0e9909d9b5 tomato.dm: Killer Tomato mob appearing at user's position, not Killer Tomato item's position (#21167)
fixed years-old bug: when awakened, Killer Tomato (mob) would spawn at user's position, not Killer Tomato (item)'s position; thus, a thrown, awakening Killer Tomato (item) would vanish unceremoniously into the ether, while elsewhere, the now-distant thrower would spontaneously generate a Killer Tomato (mob) under their feet
2023-06-02 19:30:26 +01:00
Burzah
d8393fcf79 Removes duplicate code from ERT RED Medic (#21161) 2023-06-02 19:28:47 +01:00
Luc
1d0db0e4ed notify_ghosts should now work better with larger icons (#21158) 2023-06-02 19:24:54 +01:00
Contrabang
2a5b1aba4b goodbye runtime (#21155) 2023-06-02 19:18:36 +01:00
DGamerL
68ee2a5e3d making a PR to not have to edit the wiki is based (#21146) 2023-06-02 19:05:22 +01:00
SteelSlayer
42e172de8a fix giving xenos objects (#21144) 2023-06-02 19:04:21 +01:00
Christasmurf
81024f910e Adds JaniDrobe, LawDrobe (No Mapping) (#21141)
* drobes and shit

* Update code/game/machinery/vendors/wardrobe_vendors.dm

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

* janidrobe sprite change

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-06-02 19:03:49 +01:00
matttheficus
7559f04e32 Paramedic Tweaks (and Tiny CMO Tweak) (#21129)
* life saving care for the paramedic

* oops forgot the toolbox
2023-06-02 18:27:49 +01:00
Nathan Winters
62e29032da Fix harvest message reporting decimal item amount when using Robust Harvest (#21127)
* Readability

* Apply an official `CEILING` to the yield getter

* Refactor `harvest`

* Sirryan review
2023-06-02 18:27:35 +01:00
Qwertytoforty
b6ddedd71c Engi ERT now get hardened wireless interface implants (#21119) 2023-06-02 18:17:19 +01:00
Vi3trice
578609b42a You brought this upon yourself botany (#21117) 2023-06-02 18:13:03 +01:00
DGamerL
6ee6c3d39c Equal magboots for all (#21115)
* magboots go brrr

* removes a comment

* additions from Contra
2023-06-02 18:10:57 +01:00
efzapa
214be6753f adds mint to mojito recipe (#21112)
* adds mint to mojito recipe

* byond when you miss a single character
2023-06-02 18:09:24 +01:00
Contrabang
dbd0f6c1ca holostretch better (#21110) 2023-06-02 18:08:05 +01:00
ppi13
70abf0bf81 Buffs morphine duration (#21107)
* Buffs morphine duration

* Updates cycles to fit current cycles

before 15 units took 37.5 cycles now they do 60 cycles.

* Revert "Updates cycles to fit current cycles"

This reverts commit cc2202356c.
2023-06-02 18:06:14 +01:00
Qwertytoforty
1a55ef9bc2 morphine now processes on OD (#21102) 2023-06-02 18:00:36 +01:00
HMBGERDO
2f89b304d3 garrote tweak (#21092) 2023-06-02 18:00:05 +01:00
GDN
ceaad4de97 Reworks changeling's last resort (#21087)
* Reworks last resort

* fix

* fix

* speed brought down
2023-06-02 17:46:49 +01:00
HMBGERDO
feb480e39c if baton would stun cyborgs, it would stun bots too (#21062)
* if baton would stun cyborgs, it would stun bots too

* added visible message when stunning bots

* cleanup
2023-06-02 17:41:56 +01:00
Henri215
f2ef07239f Updates piano path (#20839)
* Updates piano path

* ops
2023-06-02 17:34:10 +01:00
S34N
02556b4105 gorillas reborn (#21218) 2023-06-02 11:28:16 -05:00
Luc
25cc41a8de Improved Alien Examine (#20655)
* Moves code around from base human to more general functions

* Remove human handlers p much entirely, more reorganization

* Little bit more reorganization

* Remove todo

* Extract brute message checks

* updating

* Updates

* little bugfixes and cleanup

* Apply suggestions from code review

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

* Update code/modules/mob/living/carbon/examine.dm

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

* squish hex code in

* Apply suggestions from code review

* Adds legcuffing

* ooooops

* Farie review

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-02 10:08:51 -05:00
HMBGERDO
02db93e37e Stunbaton delayed knockdown now respects antistuns (#21069)
* stunbaton delayed knockdown now moved into status effect

* renaming proc to keep its meaning

* made STATUS_EFFECT_DELAYED as status effect for any delayed logic, removed STATUS_EFFECT_BATONNED

* cleanup, little bug fixing

* cleanup

* whoopsie

* updates

* signal string changed

* Update code/datums/status_effects/neutral.dm

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-06-01 18:36:44 -05:00
S34N
bdb8039c8f Adds gorillas and cargorillas (#20830)
* goril

* goril2

* arms

* goril3

* goril4

* rampaging

* emote

* trait

* more gorilla

* ooga

* Magillitis Serum Autoinjector, crates

* return to monke

* remove unused trait

* oops

* sirryan

* earth

* Update code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm

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

* Update code/modules/reagents/chemistry/reagents/misc_reagents.dm

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

* fixes and stuff

* gorilla text clarification

* tweak probs, stop if dead

* volume

* gorilla sleeping attack

* Apply suggestions from code review

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2023-06-01 18:36:07 -05: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
Samman166
49b26c4eba WT Rework and Nerf (#20536)
* Reworks and nerfs WTs

* Removes some duplicate comments

* Makes WT ammo box's normal sized items because I forgot to at first

* Adds a var to WT mags to check if they are being loaded to prevent people from queueing up multiple reload processes at once

* Sanity checks work properly now

* Implements changes requested, empty magazines now available from RND, ammo crate contains 5 full magazines, mag size set back to 20, magazines made normal sized items and fit in assault belt

* Update code/__HELPERS/mob_helpers.dm

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

* Update code/__HELPERS/mob_helpers.dm

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

* Magazines fit in security webbings

* I forgot a comma

* Apply suggestions from code review

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

* Applying various reviewer suggestions

* Applies various suggestions

* removes moving_do_after now that its a param

* Apply suggestions from code review

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

* solves the merge conflict hopefully

* step one of trying to fix conflict again

* step two hopefully fixes conflict

* Delete ammo.dmi

* Merge branch 'master' into wt-rework

* Apply suggestions from code review

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

* Applying various reviewer suggestions

* Revert "Applying various reviewer suggestions"

This reverts commit 7081e9aa2b.

* Revert "Apply suggestions from code review"

This reverts commit 96dab4f8b8.

* Revert "Merge branch 'master' into wt-rework"

This reverts commit 6906a67654.

* Merge branch 'master' into wt-rework

* please god work

* Update code/modules/projectiles/ammunition.dm

* Update code/modules/projectiles/ammunition/magazines.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-05-25 18:41:56 +02:00
Qwertytoforty
34a7003c5a minor spelling mistake (#21131) 2023-05-22 22:27:08 +02:00
Nathan Winters
6f57af4f95 Fix plant reagent genes producing more chemicals than expected (#21126) 2023-05-22 22:27:02 +02:00
JimKil3
c5c5ce7694 Clears upgrades properly, not just their effects (#21100) 2023-05-22 22:26:52 +02:00
JimKil3
68154c9813 minor spelling mistake (#21095) 2023-05-22 22:26:46 +02:00