Commit Graph

56 Commits

Author SHA1 Message Date
CRUNCH 9ef47e7935 Enhances the Smoking Experience - Adds Many New Item Interactions for Cigarettes and Items Interacting With Them (#25571)
* Refactoring and other stuff.

* moar

* More smoking

* Update energy_melee_weapons.dm

* Update code/game/objects/items/robot/cyborg_gripper.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update cigs.dm

* Update cigs.dm

* Update cigs.dm

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* eee

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* sigh

* Update cigs.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* hell

* Update cigs.dm

* aa

* cool

* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* aa

* aaa

* suffering

* Soon

* Is it done!? Am I finally free!?

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update

* Update

* No longer assume the cig is in a mouth

* Update tools.dm

* Update pronouns.dm

* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* update

* Attack animations for sword lighting!

* Update

* indentation

* Update cigs.dm

* minor refactor

* Update items.dm

* Update items.dm

* Update welder.dm

* Update energy_melee_weapons.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* refactor

* Update items.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* Update flamethrower.dm

* clipping

* Update legion_loot.dm

* anti attack check

* Fixes a zippo runtime

* Fixes evil runtime and stops unnecessary violence.

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update based on review

* Update cigs.dm

* Update energy_melee_weapons.dm

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update toys.dm

* Update energy_melee_weapons.dm

* Update legion_loot.dm

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-09-03 13:02:13 +00:00
datlo 97f46ffe84 Refactor and rework the staff of chaos (#23472)
* [WIP] Refactor and rework the staff of chaos

* update lists

* Add trick weapons

* rename damaging effect, more stuff

* add chaos wand

* implement gift spawning, css, disco, wand

* string tweaks, prank toys

* tweaks + bonus soul

* tweak

* add prank revolver

* fix

* tweak

* implement lethal effects + tweaks

* string tweaks

* implement negative effects

* implement remaining effects

* remove leftovers

* non carbon handling

* non-human handling

* wand human check

* clean up

* Balance

* remove test comment

* remove debug chaos items

* add message to dead check

* clean leftovers

* review suggestions

* Update code/modules/projectiles/guns/chaos_bolt.dm

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

* Apply suggestions from review

* oh and that one too

* Update code/modules/projectiles/guns/projectile/revolver.dm

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

* documentation fix

for some reason chaos_bolt has a bunch of changes not in the git

* add css classes

* recompile css, fix food

* recompile tgui

* Apply suggestions from code review

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

* invoke async proc ref

* adress code review

* fix conflict

* rename var

---------

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>
2024-02-04 21:32:10 +00:00
Qwertytoforty f01a25ee5d Fixes wand capcity (#22946) 2023-10-20 20:15:26 +01:00
matttheficus c7ac349f7a Drastically Reduces Execution Time for Handguns + Makes it Weapon-Dependent (#22714)
* its gun time

* magic is fun!

* Update stun.dm
2023-10-20 20:02:28 +01: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
Luc 9ba005de9f Add themselves as a pronoun helper, fixes some usages of it (#20184)
* Add themselves helper

* Testing and replacing

* Fixes some non-standard usages
2023-01-20 19:28:48 -05:00
S34N edeba92326 Smoke spells readability (#19387)
* read the smoke

* oops

* contra

* contra

* more tidying

* last one

* Update code/modules/projectiles/projectile/magic.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-15 18:05:55 +02:00
moxian e946c0b537 Switch guns and grenades over to /Initialize (#18332) 2022-07-24 11:44:42 +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 3bd7952ffb guns (#18237) 2022-07-08 09:18:54 +02:00
atteria bcf90593ed Improves belt item overlay code, Adds new belt item overlay sprites (#17568)
* belt-improvements-and-sprites

* fixes my fix of botany belt allowed contents
2022-04-12 15:57:21 +01:00
variableundefined baa59c4042 Merge pull request #16654 from farie82/add_attack_log-ssd-tweak
Attack logs on SSD targets now only get the FEW loglevel if there is a user doing it
2021-09-09 17:14:59 -05:00
joep van der velden 4b22aa12da add_attack_logs ssd tweak
only overrides the log_level if the target is SSD AND there is a user
2021-09-07 21:04:29 +02:00
SteelSlayer 3cc83e6011 wand of slipping fixes 2021-09-06 12:23:27 -05:00
Fox McCloud 07d505b33b Ports Biotypes (#15471)
* Ports Biotypes

* styling

* converts a species trait

* comment
2021-02-25 15:55:55 +00:00
Dsdiy 7bfc68afa6 Updating Clown Ruin and nerfing Staff of slipping. (#15362)
* Updating Clown Ruin and nerfing Staff of slipping.

I noticed how the staff of slipping was commonly used by antags as an infinite stun that also affected borgs. So, I replaced the one that spawns on lavaland with one that only has 5 charges.

* Updates as requested

Changed to wand of slipping to avoid confusion with staff

* Old nerfed Staff removal

Quickly removes old nerfed staff

* fixes errors

should compile in DM now

* requested changes

Changes as requested by Arc
2021-02-21 21:30:28 +00:00
Fox McCloud b3d69aac9b Moves to BYOND 513 (#13650)
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
2020-06-26 01:15:59 -06:00
Daylight a44c9b57e7 Probablly should remove this too. 2020-05-02 15:51:14 +03:00
Daylight 83ab08bae9 Makes no_den_usage only on door wand again 2020-05-02 15:46:59 +03:00
Daylight ac0c227b21 Uses TRUE instead of 1 2020-04-28 15:52:43 +03:00
Daylight 8f28b1eef2 Moves den usage to parent, all wands no longer work on den 2020-04-28 15:26:27 +03:00
Daylight 027036ef46 Revert "Revert "makes wand of door creation not work in den""
This reverts commit 7eac9c92be.
2020-04-28 02:13:04 +03:00
Daylight 7eac9c92be Revert "makes wand of door creation not work in den"
This reverts commit 91cf99f20e.
2020-04-28 00:30:18 +03:00
Daylight 91cf99f20e makes wand of door creation not work in den 2020-04-28 00:21:57 +03:00
farie82 ebded4f39e Logging prio changes (#13174) 2020-03-22 20:47:51 -06:00
farie82 604daa05e1 Adds a new logging system and a logging view (#13115)
* Super early initial commit

* Why do I keep comitting this

* in between

* In between

* Sort fix. Transfer fix. HTML and more

* Scrolling + define values change

* Search fixes and time input fixes

* Minor tweaks. Fuel tank inclusion. Fixes

* derp

* Extra logging to fuel tank

* minor stuff

* add the message to admins for fueltanks

* Don't keep mob/atom references + fixes

* line fixes?

* Review improvements

* pois comment
2020-03-21 17:28:20 -06:00
farie82 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Aurorablade 4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05:00
Purpose 6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
Tayyyyyyy 919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
tigercat2000 2364b0332b Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps 2018-04-19 15:08:59 -08:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown 7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
Sam 2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Krausus 4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Mieszko Jędrzejczak 1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
2017-01-11 23:11:29 +01:00
TullyBurnalot ecaf8678ab Wand of Death now deals Burn 2017-01-07 15:15:17 +00:00
TullyBurnalot 69ff538a02 Readjusts Wand of Death for pure bugfix 2017-01-07 01:06:47 +00:00
TullyBurnalot 77371a6730 Wand of Death now gibs people 2017-01-05 22:39:38 +00:00
Markolie 2e711d1337 Lay groundwork for megafauna, and add Ashdragon.
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
TheDZD a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
TheDZD 95d7a68a75 Here we go again... 2016-05-31 22:50:53 -04:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tastyfish 85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
Tigercat2000 0603f73232 Bay12 examine overhaul.
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
Fox-McCloud 93392f8e90 Explosion Rework 2015-06-20 04:13:55 -04:00