Commit Graph

4202 Commits

Author SHA1 Message Date
matttheficus
f48693ef4c Adds Fragmentation Grenades to the Uplink (#21726)
* boom boom pow

* ctrl + c / ctrl + v is bad
2023-07-24 15:42:11 +01:00
SteelSlayer
b1beace4ea stealth implant cooldown balancing (#21713) 2023-07-24 15:36:56 +01:00
Contrabang
2e7c83866c Fixes headrevs being able to be mindshielded (#21714)
* VIVAAAAA

* sirryan review
2023-07-24 15:36:42 +01:00
larentoun
1f61451c98 fix: Storage shuffling sound now works for mousedrops (#21662)
https://github.com/ss220-space/Paradise/pull/1357
2023-07-23 23:30:50 +01:00
Contrabang
01889aae10 Buffs the Camera bug by adding hidden cameras (#21618)
* LETS GOOOOOo

* desc

* steel review

* ASYNC MAGIC!

* lewcc review

* i cant spell

* async
2023-07-23 23:28:56 +01:00
JimKil3
86874ce415 Adds the titanium push broom, a janitor-exclusive traitor item (#21496)
* adds it

* fixes the thing

* !! scope size increasing !!

* trait rename

* surplus removing

* Apply suggestions from code review

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

* code review commit 2

* fixes a minor issue

* check_grep please have mercy

* Apply suggestions from code review

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-07-23 23:28:24 +01:00
Octus
912d444d07 Removes Vox... Armalis, yes the other vox we forgot about (#21519)
* youtube 2008 die sound effect

* I take pride in my work

* noisecannonsbegone

* armalis clothing shit
2023-07-23 20:14:27 +01:00
Sadhorizon
855a88a548 drip (#21624) 2023-07-17 15:37:38 +01:00
larentoun
a53796ef1d feat: BRPED tier4 for debugging (#21655) 2023-07-17 11:04:00 +01:00
larentoun
297e268b15 [FEAT] Battlemage Bundle now contains wizard magboots! (#21671)
* feat: Battlemage Bundle now contains wizard magboots!
https://github.com/ss220-space/Paradise/pull/1061

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

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-07-17 10:57:00 +01:00
Badoniondev
5e0e175a39 Refactors inventory items code to allow to play custom sounds, adds custom sounds to pill bottles and patch packs (#21634)
* Removed dupe playsound, sound now uses var

* pill bottles now have sounds

* Patch packs also have sounds

* Increased patch packs volume by 4db

* Moved sounds to folder, added licence and credits.

* Fixed invalid sound paths
2023-07-17 10:54:57 +01:00
SteelSlayer
0786ecaf5c stealth implant boxes don't drop cardboard (#21706) 2023-07-17 10:49:11 +01:00
Nathan Winters
40927ac3eb Fix some defib bugs (#21353)
* Slightly clean up `undergoing_cardiac_arrest`

* Fix runtime when defibbing a heartless slimeperson

* Slightly clean up `defibrillate`

* Deduplicate this

* Yeet this unused signal

* Yeet these unused return flags

* Minor cleanup

* More cleanup and readability; fix defibs reporting outdated brain damage

* Fix defibrillators healing brain damage

* Fix defib brain damage scaling the wrong way (who the fuck)

* Fix this macro expansion bug (I'm going to become the joker)
2023-07-15 14:52:04 -05:00
Qwertytoforty
995571183f Toy dualswords no longer fucking kill the crew when thrown into, clowns no longer die to toy dsword. (#21620) 2023-07-10 10:04:00 -05:00
Fridge Burns
a19e2fb130 fix the bat (#21617)
Add RANDOM_BLOCKER flag so the bat will deflect stuff
2023-07-10 11:10:53 +01:00
Contrabang
7fb0e7157a exploit gone (#21605) 2023-07-09 10:47:13 +01:00
HMBGERDO
62a2c82eab Hand tele tweaks (#21224)
* hand tele tweaks

* i need to sleep

* updated portal description, removed hand tele ability to remove portals

* added disabled icon state, removed dual portals

* syndi teleporter stages + icons

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

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

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

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

* Update code/game/objects/effects/portals.dm

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

* resolving conflict

* no more races

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-07-07 13:57:56 +01:00
GDN
11e7d641e8 fixes mining armblades being unable to be picked up after being dropped (#21333)
* fixes mining armblades being unable to be picked up after being dropped

* Oh yeah right
2023-07-07 13:55:38 +01:00
BiancaWilkson
978f43c5e9 Ear Organ Refactor + Deafness is a status effect (#21405)
* begone ear_damage

* pt 2

* this time actually begone

* ears no longer passively heal over time

* ears can die

* deafness is now a status effect

* Oh yeah ticks are every two seconds
2023-07-07 13:54:27 +01:00
DGamerL
887a5111df Adds confetti shot (#21462)
* CONFETTI CANNON

* proc and contra review

* sprite names

* nukie uplink and lewcc suggestions

* chemical fixed

* fixes party drums cost and chem explosion sound

* Henri review

* renames a datum because I copypasted shit

* changes a name because I copy pasted

* removes an extra space

* things I forgot + bundles + recipe change

* Oopsie + tones down the volume of confetti
2023-07-07 13:44:55 +01:00
matttheficus
dd9079aa1a Adds Cargo Office Access to JaniKeyring + Fits in JaniBelt (#21471)
* oopsies

* oops here's another fix
2023-07-07 13:41:54 +01:00
matttheficus
4317881bcc Adds Hydrocodone to the Syndi Med Duffel (#21472)
* fix time

* a slight reduction
2023-07-07 13:41:26 +01:00
Contrabang
e212ca48ed Updates wallets (#21531)
* wallet update wooo

* didnt want to do that

* undo accidental changes

* i have a problem

* i swear I can type comments well
2023-07-07 13:26:07 +01:00
BiancaWilkson
0ac521e633 RCD ammo can be directly clicked (#21536) 2023-07-07 13:25:32 +01:00
SteelSlayer
05c08aa01d Adds the Stealth implant, available to traitors (#21235)
* adds the stealth implant

* changes

- rename "implant" to "bio-chip"
- removes the stealth implant box in favor of spawning implant directly for the traitor
- makes the fake box not show up on right click. Makes the real box not show up on right click when invis

* sirryan pt1

* lewcc review 1

* fix conflict

* fix conflict

* signal handler
2023-07-01 11:20:18 +01:00
Qwertytoforty
04e1792d0d Dswords now return melee attack on parry. Eswords reflect lasers on parry. Throwing bodies at a dsword user may not work well (#21463) 2023-07-01 10:42:44 +02:00
Qwertytoforty
032b065214 Buffs the uplink thermal safe drill (#21312)
* commit stuff for safety

* making sure this shit saves

* I am commiting every 5 frames now, sorry. I lost 25 frames as the file got corrupted

* 45 frames

* 51 total frames now

* 55

* 65

* 70 frames

* 75

* 80 frames almost there

* Behold, a useful uplink item.

* removes debug message

* Apply suggestions from code review

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-06-28 15:38:55 +01:00
warriorstar-orion
ef1443bd56 Whitespace fixes. (#21371) 2023-06-19 19:43:56 +01:00
matttheficus
468088f402 you get a mag and YOU get a mag and YOU get a mag (#21300) 2023-06-15 21:23:02 +01:00
Sadhorizon
8e907c80c2 psych garment suit (#21268) 2023-06-14 21:09:57 +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
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
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
Vi3trice
578609b42a You brought this upon yourself botany (#21117) 2023-06-02 18:13:03 +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
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