Commit Graph

3852 Commits

Author SHA1 Message Date
Contrabang
5c0cb85c74 cqc price change + discount (#21249) 2023-06-14 21:10:49 +01:00
Nathan Winters
162a03ba15 Fix Drowsiness and Drunkenness rolling their effects way too often (#21290) 2023-06-14 21:03:32 +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
DGamerL
bf344f7ca7 OOPS (#21311) 2023-06-11 18:41:38 -05:00
HMBGERDO
acabffb6fc Fixing infinite fire alarm sounds (#21246)
* no more adding twice

* better function to do the same
2023-06-09 23:01:28 -05:00
HMBGERDO
50ec7d1adc Improved cooldown visualisation on spells with charges (#21065)
* improved cooldown on spells with charges, now you see amount of current charges and process of recharging new one

* update

* cleanup

* somehow sometimes it returns more than 1, taking min(1, val) then

* created proc ShouldShowCooldown especially for HUD panels

* bug fix && little cleanup

* ssssnakes

* moved some procs to cooldown handler class

* if button is dark again if it is not available
2023-06-05 20:03:54 +02: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
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
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
Adrer
417c0e8f49 Honksquad clowns now spawn with comic sans and title (#21139)
* Honksquad now spawn with comic sans and title

* Minor spelling mistake

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-06-02 19:01:42 +01:00
HMBGERDO
2f89b304d3 garrote tweak (#21092) 2023-06-02 18:00:05 +01:00
S34N
14d78b6988 [DNM] Runechat refactor (#20860)
* runechat optimisations

* Apply suggestions from code review

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

* length

* fixes

* reset this value

* amazing grace

* whitespace

* snowball fixes

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-06-01 21:10:16 -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
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
Qwertytoforty
ac8eb9a046 Moves the posion bottle to the main uplink (#21088) 2023-05-22 22:25:23 +02:00
Contrabang
4f11b2c875 defib no longer flashes all ghost's screens (#21075) 2023-05-22 22:24:19 +02:00
Qwertytoforty
1fd9336cf3 Removes bluespace crystal sheets, makes crystals look as expected (#21028) 2023-05-22 22:05:34 +02:00
Henri215
764aed10c5 Adds custom age limits to each species (#20878)
* Custom min/max ages for species

* fixing the pitch

* tweaking AGE_MAX

* Revert "tweaking AGE_MAX"

This reverts commit 0270ba6840.

* max_age decreased roughly by 10%

* Update code/__DEFINES/mob_defines.dm

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

* machine minimum age

* clamp

* Adjustments to ages

* age max

* Update code/modules/mob/living/carbon/human/species/_species.dm

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

* clamp and age pitch tweaks

* finally found plasmaman lifespan1

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-22 22:04:42 +02:00
Sean Dandrea
71c90e9f47 Add default binding for Give and Whisper, remove Cycle Intents (#20747)
Co-authored-by: Sean Dandrea <SeanOfAndrea@outlook.com>
2023-05-21 13:26:12 -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
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
Henri215
c68a421171 boop emote sound (#20965) 2023-05-14 00:24:00 +02:00
Qwertytoforty
970b593e7d Makes emp bomb more useful (#21014) 2023-05-13 23:45:00 +02:00
Contrabang
f75a27ec97 sentiental (#21002) 2023-05-11 12:33:44 -05: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
Qwertytoforty
d5567103fd Reworks the lwap to make it better. (#20884)
* Boss you killed a child... AMAZING MISSION COMPL-

* small patch fix other stuff later

* More fixes to clicking on the dot

* lwap scopes better / decativates on movement

* Apply suggestions from code review

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

* requested changes

* lower speed by marms suggestion

* scope keeps creeping

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* henks changes

* define

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-05-02 21:28:34 +02:00
GDN
80454ec8eb fixes negative plasma on xenos (#20950)
* fixes negative plasma on xenos

* Update code/datums/spells/alien_spells/basetype_alien_spell.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-27 18:28:32 +01:00
Luc
0f4754e17b turns out this was easier than I thought (#20909) 2023-04-25 21:14:00 +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
S34N
4a5fb011e6 515 Compliance part 2 (#20809)
* more illegal procpaths

* Update code/modules/ruins/lavalandruin_code/puzzle.dm

* REGEX_REPLACE_HANDLER

* shuttle fix
2023-04-22 09:28:54 +02:00
Henri215
72402e782b Updates the U.S.S.P with new looks and loadouts for admins v2 (#20669)
* Custom USSP roles for admins

* Added the sprites for new USSP

* conflict part 2

* Elder Gods please make this work

* new style for soviet box

* Added Soviet headset

* lets fix this conflict

* Die conflict!

* Sirryan review

* Apply suggestions from code review

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

* Lets solve this conflict

* Die conflict!

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-22 09:16:56 +02:00
Luc
0f26af70e1 Wire-name labeling items are now useless for the nuke and syndie bombs (#20608)
* We do a little scrambling

* Removes extraneous proc, adds checking offhand

* update global trait list
2023-04-21 18:37:34 -05:00
GDN
3959de6eb7 Changes hardstuns on vendor shoves to be reduced, removes vendor chaining (#20631)
* Update vending.dm

* flatskrell.net

* charlie's request
2023-04-15 21:59:43 +02:00
Charlie
e6085895c1 burn wounds, for real this time (#20542)
* burn wounds

* user feedback

* ready for review

* sean review

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* surgery fix

* other repair methods

* GDN review

* health scanner feedback

* Update code/game/objects/items/devices/scanners.dm

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

* bodyscanner print out

* Update code/game/machinery/adv_med.dm

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2023-04-14 15:58:38 +02:00
Contrabang
db3252f9ee Splits traitor items and nuclear agent items into seperate files (#20620)
* commits a terrible file moving crime

* Updates for #20425
2023-03-29 19:51:05 +02:00
S34N
b90845c2e3 Balances skeletons by adding a subtype (#20587)
* balance skellies

* spoopy and scary

* more skellybones

* Ancient

* Apply suggestions from code review

* Update code/modules/mob/living/carbon/human/species/skeleton_species.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-03-27 20:39:24 +02:00
S34N
fa040cdb65 Fixes gamma armoury hatch cheese (#20479)
* Fixes gamma armoury hatch cheese

* mira fix
2023-03-26 15:08:54 -05:00
Burzah
ec3e9962d8 name adjustment to key bind (#20705) 2023-03-26 11:45:42 +01:00
Octus
a19e2cc4ef Freedom Implant is now 5 TC instead of 6 TC (#20425)
* ITS TOO EZ

* CMON MAN ITS TOO EZ
2023-03-23 11:38:17 +00:00
GDN
22efb88e45 Roundstart blob removal attempt 3 (#20403) 2023-03-23 11:27:22 +00:00
Coolrune206
48eb386e5c Donk Pocket Cooling 2: The Reworkening (#20453)
* donk pocket rework

* Snowball had a far more sensible way to do this

* lewcc review

* Sirryan review

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

* I fix?

* Revert "I fix?"

This reverts commit 1517d2e21e.

* please work you stupid .dmi

* WORK DAMN YOU

* will this hypothetically work

* re-adds syndie donk kit

* documented these

* just return

* clause guarded

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-03-20 14:26:06 -05:00
Henri215
2a40482e58 Ports TG Fake virus event (#20573)
* Ports TG Fake virus event

* weight and comments

* GDN review

* Splitting into four different fake viruses

* Apply suggestions from code review

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

* Update code/__DEFINES/status_effects.dm

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

* Sirryan review

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* create_log for the fake virus

* using lists inside of lists

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* farie review

* Checking fake_emote length

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-18 11:44:55 +01:00
Coolrune206
1f01292347 Gives fleshmend a weakness to cold (#20505)
* gives fleshmend a weakness to cold

* Thanks Henri

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

* Sirryan review

yup, this is better

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

* Sirryan review

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

* Farie review

* Naming is hard

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* don't think about code while you're still in bed

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-17 08:50:27 +01:00
Coolrune206
d19e8dfb0f Reworks Cling Hivemind (#20375)
* reworks Cling Hivemind

* bye bye old vars

* protects starting DNA
2023-03-15 20:40:39 +01:00
Luc
eafe04f41f Pops up a little bubble when you're requesting a high-five, along with some other emotes (#20472)
* High five!

* Add in-hand use

* use in hand too

* closing remarks

* better looking

* Fixes daps

* grab my hand fat man

* hand shake

* Implement missed messages

* i can spell

* Update code/modules/mob/living/carbon/human/human_emote.dm

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

* Review concerns

* Add some auto-doc, minor changes

* more cleverly handles pointing

* Update code/modules/point/point.dm

Path clarity

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-15 20:37:54 +01:00
AffectedArc07
72ba1ada7b Nukes karma (#20628)
* Nukes karma

* Skin + logic

* TGUI Build
2023-03-14 19:14:47 +00:00
S34N
69bd5ad19b Adds more QoL logs for admins (#20468)
* More logs

* why is this not ignored

* you never know if someone has busted DNA

* Update code/controllers/subsystem/jobs.dm

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

* Apply suggestions from code review

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-03-13 22:24:22 +00:00