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
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
f01a25ee5d
Fixes wand capcity ( #22946 )
2023-10-20 20:15:26 +01:00
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
f3f9bd442a
Changes slot number defines from lowercase to all uppercase ( #22297 )
...
* undo all of it
* flags
* back
* head/mask
* left
* right
* Cuffs
* other name changes
* ID and PDA
* idk about calling them SLOT_HUD now
* glasses, gloves, and shoes, oh my!
* the rest
* comment
2023-10-03 18:27:51 +01:00
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
9fdf2992be
Ports Rod of Asclepius in hand sprites and moves staves in hands into a new file ( #22250 )
...
* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file
* removing for now
* its conflict time
* lets fix this conflict
* ah shit
* here we go again
2023-09-19 18:58:11 +01:00
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
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
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
e946c0b537
Switch guns and grenades over to /Initialize ( #18332 )
2022-07-24 11:44:42 +02:00
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
2022-07-21 08:11:59 +02:00
3bd7952ffb
guns ( #18237 )
2022-07-08 09:18:54 +02:00
77d03f7ab9
Spellblade rework ( #17693 )
...
* fire lighting and shielding
* blink + lavaland loot
* file move and projectile removal
* get out of MY WALLS
* review
* sprites
* forgot this
* sprite update
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* some TM changes
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2022-06-06 16:22:18 +01:00
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
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
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
3cc83e6011
wand of slipping fixes
2021-09-06 12:23:27 -05:00
07d505b33b
Ports Biotypes ( #15471 )
...
* Ports Biotypes
* styling
* converts a species trait
* comment
2021-02-25 15:55:55 +00:00
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
1249616676
Update staff.dm ( #15164 )
2020-12-21 09:43:09 +00:00
81682dc626
Adds muzzle flashes for guns depending on the ammo ( #13322 )
...
* Muzzle flashes added for guns
* Use an muzzle flash effect now.
* Unused var
* sillenced guns have a lower alpha muzzleflash effect
2020-09-20 12:41:45 -04:00
07597b9480
Merge pull request #13326 from AzuleUtama/slipStaffNerf
...
Lowers max charges and recharge time for Staff of Slipping
2020-07-08 19:20:28 -04:00
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
a44c9b57e7
Probablly should remove this too.
2020-05-02 15:51:14 +03:00
83ab08bae9
Makes no_den_usage only on door wand again
2020-05-02 15:46:59 +03:00
ac0c227b21
Uses TRUE instead of 1
2020-04-28 15:52:43 +03:00
8f28b1eef2
Moves den usage to parent, all wands no longer work on den
2020-04-28 15:26:27 +03:00
027036ef46
Revert "Revert "makes wand of door creation not work in den""
...
This reverts commit 7eac9c92be
2020-04-28 02:13:04 +03:00
7eac9c92be
Revert "makes wand of door creation not work in den"
...
This reverts commit 91cf99f20e
2020-04-28 00:30:18 +03:00
91cf99f20e
makes wand of door creation not work in den
2020-04-28 00:21:57 +03:00
7f2c01be84
Lowers staff stats
2020-04-22 22:46:12 +01:00
ebded4f39e
Logging prio changes ( #13174 )
2020-03-22 20:47:51 -06:00
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
0e8ddb2afe
Refactors the examine proc to return a list of strings ( #12280 )
2019-09-25 22:05:01 -07:00
69537dd60c
Port TG hitby refactor and detonation of items by projectiles
2019-09-09 22:57:31 -04:00
b812736517
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE
2019-01-19 23:35:15 -05:00
4fc35a68b1
Gonna have to clean some files after this.
2019-01-19 22:38:47 -05:00
c37b22c00b
replace placeholder sprite
...
oops
2019-01-01 21:23:41 +00:00
5b92bdd66d
Add staff of slipping (placeholder sprites)
2018-12-30 16:54:16 +00:00
86d2a1634c
Casing correction 1
2018-12-17 00:07:37 -05:00
87f3a7c1b3
Caseing
2018-12-10 21:52:10 -05:00
6cb07cb70c
Fixes a bunch of shown messages
2018-09-29 19:10:10 +01:00
919bd7aaf2
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
eafd57487c
Merge remote-tracking branch 'upstream/master' into component-port
...
# Conflicts:
# paradise.dme
2018-04-23 13:54:50 -04:00
0382afcb33
Ports TG Components
2018-04-21 01:22:50 -04:00
2364b0332b
Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps
2018-04-19 15:08:59 -08:00
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
7ed2c68ea7
compiles, find and replace particle_effect and effect_system
2017-11-04 20:16:01 +04:00
a0939ca93b
finish making smoke OOP, compiles
2017-11-03 22:46:49 +04:00
CRUNCH