Commit Graph

67 Commits

Author SHA1 Message Date
Chap c3d773402c [REFACTOR] Remove the flying var, adds the flying trait. (#26881)
* Remove the flying var, adds the flying trait

* Remove flight when broomstick is unwielded

* Adds some comments

* tab indentation

* Fix carp flight

* Remove comment

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2024-10-16 17:46:19 +00:00
DGamerL 4cf6595d12 Makes all playsounds use bools for vary (#26183)
* Makes all playsounds use `TRUE` for vary

* Same but for `FALSE`
2024-07-08 23:54:38 +00:00
Charlie Nolan 36b202bd26 Standardize on exclaiming about committing suicide. (#24433)
* Standardize on exclaiming about committing suicide.

* Update code/game/objects/items/weapons/kitchen.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>

* I think this is the last of the unexciting suicides.

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-03-10 18:18:36 +00:00
warriorstar-orion 0667f20681 move all EOL comments on typepath names to dmdoc (#23928)
* move all EOL comments on typepath names to dmdoc

* Apply suggestions from code review

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

* Apply suggestions from code review

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-03-01 20:05:49 +00:00
Henri215 6a109ade7f Moves a few sprites out of items.dmi (#23301)
* fuck you items.dmi

* banhammer
2023-11-24 15:39:20 +00:00
DGamerL 4c976a6e01 Splits up item_inhands.dmi (#22584)
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes jackhammer and glass shard

* Fixes toy Chainsaw

* Update code/game/objects/items/toys.dm

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

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

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

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

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

* Fixes edagger hopefully

* Henri review

* Oops

* First this gone, and now the pain

* Should all be fixed now

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-01 11:47:25 +01:00
Burzah 4150373d43 Reworks Bear Traps (#21941)
* beartrap trigger on find

* fixed an oversight

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* 2 second timer for arming a trap

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* adjust breakout time

* apply extra damage if bear

* 15% to delimb on opening bag

* reverts delimb

* first set of review changes

* small adjustment

* spring_trap proc work

* spring_trap first pass

* spring_trap take two

* code formatting and simple mob damage

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* review fixes

* Apply suggestions from code review

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

* a little code cleaing for review

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

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

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

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-08-15 14:51:54 +01:00
Qwertytoforty 7fb017915f Makes cling tentacle more reliable / less shit (#19855)
* Cling tentacle love, part 1/2

* legcuff sprite

* S34N's changes

* Apply suggestions from code review

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

* attack logs.

* BOY I LOVE ICON CONFLICTS 1/3

* BOY I LOVE ICON CONFLICTS (3/3)

* EYE FOR AN ICON

* description update

* Final changes, whoops

* [H]

* swap the order

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-06 21:31:37 +01:00
S34N 667dd5d4ac 515 Compatibility (#19636)
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
2022-11-08 23:08:40 +00:00
Vi3trice 9e90c81282 Defining Part 1 - Code cleanup toward defines (#19262)
* This is only the beginning

* Update stack.dm
2022-10-10 20:50:29 +02:00
Contrabang 8418997ed8 Moves most screwdriver checks to screwdriver_act (#19024)
* screwdriver_act my beloved

* convert to returns instead of . / lewcc review

* it will be done

* i'm a little bit stupid, but now time to test

* sometimes I get excited and press the commit

* The great test has been completed

* oh wow oh wow, lewc review

* found one last one

* Steel review

* Lewc review

* quick sirryan review

* removes stupid comments (old coders I blame)

* sirryan review two

* whoops...

* hal review

* the fix to the fix to the fix

* Revert "the fix to the fix to the fix"

FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
2022-10-06 09:30:33 +01:00
Charlie 6ab9a133ba Reworks bolas. (#18383)
* bola rework

* energy bolas aint reusable

* re-adds sprites

* SPRITES

* fix bola bag

* range fix
2022-07-24 16:11:41 +02:00
Vi3trice f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
KalevTait 6a91840962 Code Readability - Weapons (#18171)
* weapons

* weapons

* prefer explicit time

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Don't have code on same line as control statement

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-10 13:59:33 +01:00
Viz 8d1e1bd183 Makes bolas knock down instead of stunning (#18207)
* Bola stun't

* now with extra readability

* hold on a minute
2022-07-05 23:53:10 +01:00
Marm 8b876914ce Fixes ebolas (#18168) 2022-07-01 15:42:29 +01:00
Charlie bead47ea29 Adds crawling. (#17899)
* crawling?

* knockdown. CONTAINS CHANGES THAT NEED REVERTING

* plotting can_moves death

* CANMOVE IS DEAD

* mappers are insane

* removes todos as the are todone

* decreases crawling speed

* silly-con fixes

* surgery fixes

* fixes death

* pAI fixes

* removes var/lying

* runtime fix

* decreases default crawling speed

* correct crawling dir

* some more fixes

* stunbaton tweak, revert later

* rejuv fix

* restraint and incapacitated refactor

* crawling dir in line with TG

* fixes vehicle movement and grabs

* alien rest fixes

* antistun fixes

* fixed fall sounds

* forgor to stage this

* first review

* canmove zombie dispersal

* fix

* lots of fixes

* defines

* fixes the trait helper

* if you got no legs you can still crawl

* sillyconfix

* no reverty keepy

* jaunt fix

* hopefully fixes perma sleepy zzz

* admin rejuv temp fix

* rest canceling

* antistun chems now remove knockdown

* buckle offset fix

* fixes some stuff

* crawling delay = 4

* descuffs bed

* sleeping hotfix

* fixes simple mob resting

* V is the macro for resting

* projectiles no dodgy

* refines the projectile check

* god I hate strings

* MORE FIXES

* I hate buckling

* fixes capulettium plus

* winding down

* farie review

* bugs did stop showing up

* SEAN

* todo

* sean review

* ed209

* i HATE cyborgs

* steel review

* laaaaaast things

* reverts stun baton changes

* and done
2022-06-30 11:57:52 -05:00
Charlie 0f7a8707ef [Ready] Refactors stuns and status effects. (#17579)
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

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

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-05-24 16:35:26 +01:00
moxian e7ced2a0c3 one more small pr fixing purple squares (#17808)
* Set valid initial state for some dynamically chosen icons.

* random tool icon

* strange object
2022-05-17 15:39:44 +01:00
Bm0n 6437de8363 Ports In hand bola sprites from TG (#17525)
* Ports inhand bola sprites from TG

* Should be good now
2022-03-29 10:53:46 +01:00
Qwertytoforty 054939b36c Fixes IEDS not working with beartraps (#17272) 2021-12-26 12:26:49 +01:00
SabreML 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
RadiantFlash7 c55acec92b Makes E-Bolas as they should be. Noncyborg variants. (#16168)
* The E-bola is not a cyborg variant.

Returns E-bola break out time to 60, instead of 20.
Security bolas are limited supply and should be better then makeshift ones.

* whoops

Adjusts the breakout time to not to default to beartraps and use the 6 seconds listed in the Ebola item.

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-17 10:25:24 +01:00
AffectedArc07 8f72d7556e Annihilates the blackbox (#15132)
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
2020-12-24 16:06:48 -05:00
Mark van Alphen fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Arkatos1 8d79486d3a Code review fixes 2019-04-24 16:29:22 +02:00
Arkatos1 d31b159813 Added bola throw sound, sound equality across all bolas 2019-04-21 20:25:14 +02:00
Fox McCloud 814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
Fox McCloud 3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
variableundefined b874549978 Ensure bola cannot snare anyone without enough legs 2018-08-28 22:35:31 +08:00
Tayyyyyyy 919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Fox McCloud cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud f7521320a0 fixes the runtimes 2018-04-04 19:14:22 -04:00
tigercat2000 ff06bf8854 Merge pull request #8430 from Fox-McCloud/ied-buff
Buffs IEDs
2018-02-19 21:45:05 -08:00
Fox McCloud 1e1146cd21 changes 2018-02-20 00:33:22 -05:00
Aurorablade 20ddaccb9b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DisMemberments 2018-02-08 02:31:44 -05:00
Fox-McCloud 5f918ceb07 Buffs IEDs 2017-12-05 02:19:17 -05:00
uraniummeltdown 7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
Aurorablade 8c5beaaaff adds some helper procs 2017-10-26 08:09:08 -04:00
tigercat2000 633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam 07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Fox-McCloud 5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Aurorablade 47dc3a3051 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-16 02:23:20 -04:00
Fox-McCloud 659af49a43 tweak 2 2016-07-22 18:36:10 -04:00
Fox-McCloud b6c7e5f251 tweak 2016-07-22 15:05:56 -04:00
Fox-McCloud fe8ef6ca69 Adds in Bola, Other Recipe Tweaks 2016-07-22 13:20:09 -04:00
Aurorablade bb840f4dce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-07-21 23:56:34 -04:00
monster860 009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00