Commit Graph

6447 Commits

Author SHA1 Message Date
Sadhorizon
8e907c80c2 psych garment suit (#21268) 2023-06-14 21:09:57 +01:00
Silverplate
3101059543 Adds units (rads) to geiger counter readout (#21270) 2023-06-14 21:04:03 +01:00
Qwertytoforty
15ab9740cd power fist no longer works when user is pacified (#21293) 2023-06-14 21:02:30 +01:00
GDN
ad768f9ef5 Reworks sentient swords (#20585)
* initial changes

* fixes attack animations

* we lunging out here

* lunge sprite by ATP engineer

* rare oldcoder w

* more stuff

* polished

* removes testing stuff

* no longer works on backpack slot

* moving damage values around

* shawn reviews + cheese reduction

* Update code/game/objects/items/weapons/holy_weapons.dm

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

* Update code/game/objects/items/weapons/holy_weapons.dm

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

* Update code/game/objects/items/weapons/holy_weapons.dm

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

* reviews

* re-upload

* Update code/datums/spells/sentient_sword_lunge.dm

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

* Update code/game/objects/items/weapons/holy_weapons.dm

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

* merge conflict fix and readds debug spawn

* Update code/game/objects/items/weapons/holy_weapons.dm

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

* deconflict

* ryan's reviews

* improvements

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-06-12 19:39:43 -05: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
1080pCat
b91a1e92d7 Welders now use 0.5 fuel on attack. (#21019)
* THWACK

* shrimplifed the code a tad
2023-06-07 20:28:13 +01:00
Contrabang
c8418803a2 thats an oversight (#21245) 2023-06-05 19:56:21 +01:00
Sadhorizon
db7524a724 Adds four new labcoats (#21212)
* added missing labcoats

* robo lockers
forgot that they spawn with labcoats too

* Forgot to remove the WIP sprites

* sean's review
2023-06-05 12:08:21 +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
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
datlo
cf07639da3 Tweak kitchen spikes (#21152)
* Tweak kitchen spike

* fix deconstruction

* fix mistake lmao

* revert wrench_act and fix metal drop

* fix accidental removal

* and the damn end of line

* AAAA

* add mob check to victim, deconstructing tweak

* fix bug preventing attack on spikes
2023-06-02 19:12:02 +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
Taran
6f81ded4b6 adds check to make sure this only closes the safe inventory (#21123) 2023-06-02 18:21:35 +01:00
Jenny
6c5f5f7326 Added empty descriptions (#21122) 2023-06-02 18:21:08 +01:00
Vi3trice
578609b42a You brought this upon yourself botany (#21117) 2023-06-02 18:13:03 +01:00
Englishformula
a5d5086819 Alien Alloy Sprite Fix (#21103)
* Update mineral.dm

* Update mineral.dm
2023-06-02 18:07:24 +01:00
HMBGERDO
2f89b304d3 garrote tweak (#21092) 2023-06-02 18:00:05 +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
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
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
HMBGERDO
e8e85574d0 H-hel-lp m-main-n-nt-ts-s! (#21079) 2023-05-22 22:24:43 +02:00
Mooballoono
9e0dd390a2 Zippos can light Cigars (#21059)
* Makes it so Zippos can light Cigars

* accidental commit to master

* Zippos can light Cigars

* parentheses were in the wrong spots
2023-05-22 22:06:46 +02:00
Silverplate
73510a18ab Allows proximity mine signs to be used by all traitors (#20977)
* Removes jani mind requirement

* makes arm/disarm of jani sighs traitor only

* Adds mindslaves to usable mind states

* adds prox sign to surplus, standard proability

* Removes thralls from using sign (hacky method)

* allows mindslave useage (not hacky way)
2023-05-21 12:10:02 -05:00
JimKil3
dd3a23de7d Adds four new departmental tools (#20822)
* engineering crowbar

* engineering crowbar map changes

* command multitool description overhaul

* command multitool inhands

* security wirecutters

* security wirecutters map changes

* science welder

* crowbar weight class

* science welder suicide act

* welder map edits

* oagh
fixes "the the research welding tool" in its suicide act

* cargo screwdriver

* immobilize > stun

* cargo screwdriver mapping in

* sirryan review

* lewcc review

* oops

* comment clarification

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

* forgor 💀
I forgot to stage the changes to this file before the last commit

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-05-14 18:00:23 -05:00
Luc
b0567b2778 Fixes superslaps (#21011) 2023-05-11 13:51:44 -05:00
Henri215
5dc6151ce7 Adds a new sound for when the janitor proximity mine is activated (#20976)
* Adds sound to the janitor proximity mine

* here comes the sound

* Not necessary
2023-05-08 16:52:48 -05:00
matttheficus
db2aac4c1b im a silly goose (#21005) 2023-05-02 22:10:33 +02:00
Qwertytoforty
ce78b11870 gives spellblade with lightning grant the user shock immunity (#20949)
* gives spellblade with lightning grant the user shock immunity

* Apply suggestions from code review

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

* Update code/game/objects/items/weapons/melee/melee_misc.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-02 21:59:21 +02:00
Henri215
a5efbd32e8 USSP update part 2 (#20926)
* USSP part 2

* swapping old version for new one in some places
2023-05-02 21:59:01 +02:00
matttheficus
fc87927f7b Tool Size Tweaks (#20586)
* The Great Toolening

* oops all belts (incoming self conflict lul)

* defines shouldnt lie

* mini crowbar TODOs

* beeeeeeeeeg crowbar

* oops it needs a design

* purple kit + vendor fix

* add mini crowbar dmi

* oops forgot this

* i am an idiot sandwhich

* im bad at code

* scratch that, i cant read my VSC

* wrench undo + readd to boxes

* nukies too

* man i cant code

* power tools should logically follow

* formatting

* maybe im free?

* forgot inhands

* Update toolbox.dm

* bluespace belt buff (unironic)

* undo for now

* fixes bluespace/tot belts + adds w_class override

* adds small crowbar to e-toolboxes and tot tools

* power tool fix

* Rnd build path

Co-authored-by: Adrer <erwin@lombok.demon.nl>

* design fix

* merge conflict + small fix

* small name fixes

---------

Co-authored-by: Adrer <erwin@lombok.demon.nl>
2023-05-02 21:43:06 +02:00
matttheficus
ca6717c0a4 Full Belts No Longer Fit in Bags (#20547)
* The Beltening

* Antag Belt Buffs

* This needs some sanity work, it is currently non-functional

* it finally works

* fix spawn bug + bluespace/laz belts

* comments moment

* im silly + autodoc

* just in case tm

* grammar

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

* better coding practices are fun

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

* sane code, thanks sirryan

* better coding practices

* review fixes

* bluespace bag fix

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-05-02 21:19:02 +02:00
McRamon
3dbb2726ed Autopsy scanner resprite (#20957)
* moved icon

* code too

* sprite

* inhands
2023-04-27 18:37:36 +01:00
Silverplate
19af733ad2 Medical stacks (#20824)
* Fixes gauze upgrading

* Fixes accidental line removal

* Unessassary boolean

* shortens code, adds flag to /stack/medical

* Clarity and proper inhertance
2023-04-25 16:00:37 -05:00
Contrabang
b3cf5f88d9 fixes emp flash runtime (#20923) 2023-04-25 21:14:46 +02:00
DGamerL
0119174c41 Slightly buffs the atmos firefighting backpack (#20912)
* 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
2023-04-25 21:14:08 +02:00
Henri215
6826d2ba7b Moving some in hand icons to different files (#20748)
* Moving some icons out of left/righthand.dmi

* Moving sheets and ores
2023-04-25 21:13:02 +02:00
Silverplate
1e3d1dc6d6 Makes Nitrous Oxide Visible on Air Alarm, PDA, and Analyzer (#20891)
* Makes N2O not a trace gas

* Back end for nitrous readout on air alarm

* Makes nitrous appear on atmosphere scanners

* adds N2O bar to air alarm UI

* adds nitrous to PDA scanner

* TGUI Rebuild
2023-04-24 19:34:25 +02:00
Henri215
e0b7832927 Fixes spraycan icon not updating properly (#20897) 2023-04-22 09:58:15 +02:00
Henri215
e5a3192ee0 New sprites for AI modules (#20881)
* New sprites for AI modules

* pranksimov module sprite

* hacked module sprite
2023-04-22 09:45:14 +02:00
GDN
2907806b6a fixes being unable to clean stuff with soap while targeting the mouth (#20880) 2023-04-22 09:45:05 +02:00
Henri215
627a46a068 more options for matter decompiler (#20874) 2023-04-22 09:44:33 +02:00
Henri215
dc75a748f1 Fixing common spelling mistakes part 3 (#20870)
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
2023-04-22 09:44:27 +02:00
Henri215
7f080f2a3c Adds some sounds to lighters/cigs (#20862)
* more sounds for lighters

* final adjustments

* lower volume for light.ogg

* Contrabang review
2023-04-22 09:44:20 +02:00
Contrabang
b47f22ffb9 Fixes a runtime with cyborg stacks being initialized with no power source (#20848)
* begone runtime

* refactor
2023-04-22 09:43:51 +02:00
Livi
1a10d9a569 Fixed custom rollies having nicotine by default (#20757) 2023-04-22 09:27:52 +02:00
Henri215
d65ec2d5e8 Tweaks to greed ruin and die of fate (#20737)
* Tweaks to greed ruin and die of fate

* Delay between effects

* moved and updaated traitor items

* More tweaks to traitor item list

* Update code/game/objects/items/weapons/dice.dm

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

* Sirryan review

* Lets decrease the money even more

* experimental KA instead of alien pistol

* emp dmg for machines when interacting

* brainloss

* Code improvment

* forcewall removal

* Turning into a list

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-22 09:18:08 +02:00