900271af91
Updates OD lints ( #26729 )
...
* yea
* update lints
* lint changes and code fixes
* i hate old code
* dont make this an error
2024-09-27 17:02:16 +00:00
a56b96b4d7
Nukies can no longer buy the chainsaw ( #26627 )
2024-09-25 23:40:44 +00:00
e3c73110db
Adds Chemical flamethrowers ( #25091 )
...
* Initial work
* Good enough to open a PR out of draft
* Make these use the vars on the flamethrower
* Moar fixes
* Undefines define
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* This won't compile
* GDN review
* Fixes CI
* Fixes CI even more
* 5 ammo per tile now
* Heavily nerfs adding multiple fires
* Adds phlogiston as a burnable reagent
* Fixes the fire name
* Placeholder sprite + ammo use fix
* Now in cargo partially
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Lewc Review
* Adds nuclear variant
* Adds the chem flamethrower to the nukie uplink, alongside ammo
* More fire armor tweaks
* GDN review
* Update code/modules/reagents/chemistry/reagents/pyrotechnic.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* TEMPORARY PUSH
* Adds inhands
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Fixes inhands
* Makes air hot again
* Lewc review
* Audible messages and canister refilling
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@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-05 23:12:56 +00:00
2d94ff16f4
Getting Medieval - Breach Cleaver ( #26298 )
...
* Securiblade, Sheaths
* Snakesfang and Cleaver
* Crates and Armory
* Origin Tech Fix
* Chargers can now accept securiblades
* Clan Cleaver is now Breach Cleaver
* Armor Checking
* Comment and description fixes
* State comment
* More Comments
* Contains list fix
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Breacher sword hates doors
* Tab indentation
* Breacher Armor Buff - Status Effect while wielding
* Breach Cleaver Sounds - courtesy of Stoniest
* Snakesfang Codersprites
* Define Fix
* Breach Cleaver - Icon Codersprites
* Breach Cleaver Codersprites
* Gave help-intent attack on cleaver an animation
* Reduced sound intensity of wielded harm
* Moved variables below inherits
* Buff spacing, guard clause
* Improved examine
* Guard clauses the secsword powercell
* Sword mode defines
* Added undefs
* Spacing
* Securiblade loreful examine_more
* Examine_More for all swords
* Grammar
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Moved defines, added auto-docs, grammar
* Fixed secsword recharging
* Secsword burn function fix
* Cleaver Armor Buff Fix
* Fix to buff
* Securiblade burn fix, stamina charge reduction fix
* Breach Cleaver - Wielding sprite consistency, fixed sheath orientation when unsheathed
* Fixes securiblade EMP oversight
* Snakesfang can parry now
* Spelling
* Removed define indents
* Early returns
* A whole lot of fixes. Qdels the cell on delete.
* stun_delay proc doc
* Update code/datums/uplink_items/uplink_general.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Merged IF statements, relocated inits
* Armor change
* Remove null in cell variable
* Ifs to Switch
* Revert "Armor change"
This reverts commit 6b61e33433108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Removed extraneous permit var
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Early returns on object attacks
* Fixed missing cleaver sheath
* Fixed comment format
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Removed extraneous line
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* cleaving_armor_boost variable standardization
* Added intent and effects to attack logs
* Added notice to description span for antags
* Made the armor buff into a var
* Replaced get_dir(src, get_step away(H, src) with user.src
* Fixed stat check
* AP Changes
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-08-09 01:03:47 +00:00
7b151850d4
Makes surpluses spawn items again ( #26411 )
2024-08-06 20:40:40 +00:00
319a3d0bf6
Adds hijack items back to the uplink ( #26390 )
2024-08-04 16:53:59 +00:00
88fbe41208
Allows Job and Species specific items to roll discounts ( #25915 )
...
* Job and Species Discounts
* Condensed procs
* No His Grace discounts
* Better crates, no discounts for 10 TC or lower
* Removes extraneous bits
* Removed excess null, fixed out-of-scope discount floor change
* Documentation, null check, and a lot of snakes
* Reworked logic of where it does job/species checks
* Curly brackets begone
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Curly brackets begone pt2
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Removed for loops in job-species checks
* No freebies
* Early continues
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-08-04 08:01:35 +00:00
44671e31e8
Adds: The C-Foam launcher ( #25738 )
...
* The start
* Getting a bit further
* Slight ammo casing update
* Istype helper and foam blockage
* Adds status effect
* Foam blockage and status effect fixes
* Autolathe ammo + stun
* aaaaaaaa
* Adds uplink item
* Actual slowdown
* Makes attacking a bit faster again
* Ammo increase to 12
* Sirryan review
* Adds sprites - almost working
* Lots of fixes + mineral doors
* Mineral doors don't open with foam
2024-08-01 06:24:09 +00:00
165b9416be
Adds firecrackers and decoy grenades ( #25923 )
...
* boom boom pow
* a few more sounds
* Add different forms to uplink and prize counter
* new and improved
* Fuse sound or not
* it's now a box and works properly.
* Reviews
* Minor tweaks
* static list
* ope
* adjacency checks
* angry
2024-07-30 13:58:49 +00:00
521c43e2aa
Getting Medieval - Snakesfang ( #26296 )
...
* Securiblade, Sheaths
* Snakesfang and Cleaver
* Crates and Armory
* Origin Tech Fix
* Chargers can now accept securiblades
* Clan Cleaver is now Breach Cleaver
* Armor Checking
* Comment and description fixes
* State comment
* More Comments
* Contains list fix
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Breacher sword hates doors
* Tab indentation
* Breacher Armor Buff - Status Effect while wielding
* Breach Cleaver Sounds - courtesy of Stoniest
* Snakesfang Codersprites
* Define Fix
* Breach Cleaver - Icon Codersprites
* Breach Cleaver Codersprites
* Gave help-intent attack on cleaver an animation
* Reduced sound intensity of wielded harm
* Moved variables below inherits
* Buff spacing, guard clause
* Improved examine
* Guard clauses the secsword powercell
* Sword mode defines
* Added undefs
* Spacing
* Securiblade loreful examine_more
* Examine_More for all swords
* Grammar
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Moved defines, added auto-docs, grammar
* Fixed secsword recharging
* Secsword burn function fix
* Cleaver Armor Buff Fix
* Fix to buff
* Securiblade burn fix, stamina charge reduction fix
* Breach Cleaver - Wielding sprite consistency, fixed sheath orientation when unsheathed
* Fixes securiblade EMP oversight
* Snakesfang can parry now
* Spelling
* Removed define indents
* Early returns
* A whole lot of fixes. Qdels the cell on delete.
* stun_delay proc doc
* Update code/datums/uplink_items/uplink_general.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Merged IF statements, relocated inits
* Armor change
* Remove null in cell variable
* Ifs to Switch
* Revert "Armor change"
This reverts commit 6b61e3343380364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Appearance update
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Update code/game/objects/items/weapons/melee/melee_misc.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-07-30 13:46:44 +00:00
3e728beb93
Adds Nightvision Chameleon Glasses ( #26075 )
...
* nightvision chameleon googles
* im competent i promise
2024-07-11 02:24:05 +00:00
608b4223b9
Adds a traitor rapid healing item: "Hyperregenerative Medipen" ( #26033 )
...
* Adds Hyperregenative Medipen to traitor uplink
* remove rogue pixel
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/hypospray.dm
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
* Cuts iron, sanguine, and spaceaccil from the medipen
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
---------
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-06 08:38:17 +00:00
8e57d9a40b
10TC!!! ( #26076 )
2024-07-06 08:33:40 +00:00
1a3a77d42c
Replaces the projectile deflect from the titanium push broom with a good parry ( #26061 )
...
* No more reflect, good parry instead
* Remove this too
2024-07-03 03:50:03 +00:00
3721e5328d
Armour ( #26019 )
2024-07-01 18:55:51 +00:00
aff6d15117
dsword uplink status ( #25877 )
2024-07-01 18:55:17 +00:00
b4bac5d681
Holoparasites are now discountable ( #25943 )
...
* Discount the parasite!
* Fix testing values
* More testing values gone
* Carp scroll not discountable again
2024-06-29 18:06:48 +00:00
c3f0694bad
Drask Traitor Item - Cryoregenerative Enhancer ( #25885 )
...
* Drask Traitor Item - Cryoregenerative Enhancer
* Removed extraneous list
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Better Math
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Excessive spacing
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Comment fix
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Cleaner dna logic
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Better lore
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Better readability on checks
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* More noticable alert if empty.
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-29 17:54:39 +00:00
ed7782ad4c
Adds the oneuse autosurgeon ( #25978 )
2024-06-26 20:38:53 +00:00
e37c342401
Lowers the universal gun kit to stechkin pricing ( #25961 )
2024-06-22 22:45:09 +00:00
2ef31cc6e4
spikethrower price decrease ( #25872 )
2024-06-20 11:38:20 +00:00
0388f953c5
2 new traitor items: sticky tar applicator and sticky tar grenade ( #25529 )
...
* Update MechaControlConsole.js
* Changes breakout time to 30, refactors ds into s
* Update bot_construction.dm
* Revert "Update bot_construction.dm"
This reverts commit ddba7627dchttps://github.com/Daylight2/Paradise "
This reverts commit 8f1bc8c6a3ddba7627dc80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com >
* Part 1 of code review part 2
* Part 2 of code review part 2
* This took many hours too long. @Daylight2 Part 3 of code review part 2
* Update code/datums/uplink_items/uplink_general.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/spray.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com >
* Part 4 of code review part 2
* Forgot to take this out after testing
* Load-bearing whitespace
* Fixes runtime
* Moved, clusterbuster, bugfix
* Apply suggestion from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com >
* Sirryan's Review
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com >
* final final commit for real this time v3
---------
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-12 18:35:47 +00:00
c84349aab3
Yet another Christasmurf bomber jacket PR (dmi split) ( #25684 )
...
* dmisplit
* stinky new instance
* Apply suggestions from code review
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-06-12 18:18:43 +00:00
7df5e186a0
Beacons are no longer radios ( #25559 )
...
* lets goooo
* name change
* yes
* dgamer review
* Update code/modules/projectiles/projectile/special_projectiles.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-12 18:00:08 +00:00
ba8e082a5d
Ammunition can no longer be discounted in the uplink ( #25654 )
...
* Change disount on ammo, clean up code
* MARK
* Clarification
* Knuckledusters can discount
* Correction
* Moves the comment
* MARKs the nukie uplink as well
* Update code/datums/uplink_items/uplink_general.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-03 01:44:03 +00:00
5a68c5f6d3
Explorer Redux ( #24202 )
...
* WE'RE SO BACK
* LET THERE BE SOUND
* More bugs
* fixes
* sound
* hmm
* clothing sprites + minor code changes to clothes
* meestake
* spritening
* YARR
* hiss
* Cyberiad explorer remap
* hand telover
* delta days
* rooms done
* VENDOR
* Mapping done
* Salvage mapped
* qol
* Forgot the hivelord.
* woops
* oops redux
* reviews and more
* consistency
* Update code/game/jobs/job_globals.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* character
* Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/effects/spawners/random_spawners.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/hostile/pirate.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/clothing/head/job_hats.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/effects/spawners/random_spawners.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/research/designs/machine_designs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* some reviews
* Update code/game/machinery/constructable_frame.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* supply
* area repathing and ambience
* mapping
* metamapping
* Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* the doorening
* redooring
* modsuit
* more reviews
* the plasmamamninigngg
* add random salvage generation across space ruins
* add blackbox tracking for salvage sold
* gun
* deconflicts and reviews
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/clothing/head/job_hats.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/garment.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* all conversations resolved
* maybe work now?
* please no more, too many apcs
* Update code/modules/mob/living/simple_animal/corpse.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/mining/machine_vending.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/clothing/suits/misc_suits.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* henri review + action figure
* Update code/game/objects/items/toys.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* PDA
* conflicts
* more conflicts
* maybe all conflcits?
* wait fuck
* maybe fixed???
* KIDAN SPRITES
* MAYBE?
* access fixes
* explorer hotfixes 1:
- fixes space pirates dying in space
- gives explorers ORM access
- box: fixes access on NTR airlock
- box: fixes naming on BS airlock
- box: adds expedition access to mail sorting room
* add salvage selling back
* NOT FOR SALE
* oh my god actually sell the fucking salvage this time
* maybe fine now?
* carpover
* NO MORE CABLE
* balance tweaks
* some depot loot updates
* merge conflict
* deconflicted???
* woops more oversights
* skirts, bombers, exploredrobe code + sprites
* woops (again)
* deconflicting
* remove old explorer room again
* Hat fix
* minor changes to sprites and code for hats
* yarrr fix 1
* first fixes
* don't drop loot from syndies gibbed by depot destruction
* add selling back with new signal based system
* speedmerge this shit
* minor changes to collars/bomber resprite
* docking port in
* ruins
* WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN
* no more murder hallway on whiteship
* undelete meson sunglasses, redelete uristrunes
* BOOTY BAGS
* don't drop ashdrake loot from crusher kills
* box: fix ntrep fax, add explorer access to ORMroom
* add meson sunglasses item icon back
* fix cere handtele, meta shutter control, death sound arg
* cleaning up
* she mosins on my russian till i dj station
* Update code/modules/clothing/head/soft_caps.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/modules/clothing/suits/misc_suits.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/modules/mining/machine_vending.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/game/gamemodes/game_mode.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* mapping
* Cleaning up
* revert changes in tools/{bootstrap,ci}
---------
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: github-actions <github-actions@github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-05-27 19:27:59 +00:00
2b9ccda51b
Proto adrenalin price changes and one use adrenalin ( #25475 )
...
* Adrenal changes
* Update code/datums/uplink_items/uplink_general.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Rayforx <154929127+Rayforx@users.noreply.github.com >
---------
Signed-off-by: Rayforx <154929127+Rayforx@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
2024-05-27 16:35:18 +00:00
d32d6ee9eb
50% off! ( #25440 )
2024-05-23 00:57:33 +00:00
64e0947b97
prototype nanite injector now heals ipcs / robotic limbs / cybernetic organs ( #25473 )
...
* nanocalcium now heals ipcs / robotic limbs / cybernetic organs
* Update code/modules/reagents/chemistry/reagents/medicine.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com >
---------
Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-05-17 13:07:01 +00:00
7872119993
Adds additional logging for Uplink purchases ( #25454 )
...
* Adds additional logging
* Updated log to show cost of purchase
2024-05-16 04:05:08 +00:00
f105159acb
Ports the scope component from TG and new scope eyes ( #24288 )
...
* Ports the scope component from TG.
* scope eyes
* now in scope
* fixes lwap canceling other scopes
* Update code/datums/components/scope.dm
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
* c-c-c-changes
* Apply suggestions from code review
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* Update scope.dm
* moves it off the gun
* Update code/datums/components/scope.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* fixes stealth conflict
* do_after_once
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-05-14 09:26:04 +00:00
19b34fcb28
c4 can now be used on all mobs when unconscious or dead ( #25379 )
...
* c4 can now be used on all mobs when unconscious or dead
* Update code/game/objects/items/weapons/explosives.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-05-10 14:09:05 +00:00
a43944fc39
Splits Up Chameleon Kit ( #25238 )
...
* cham gear tweaks
* non-cham mask
* Henri Review
* henri review 2: electric boogaloo
2024-05-06 19:30:50 +00:00
57db220623
cant_discount -> can_discount ( #25366 )
2024-05-04 03:07:59 +00:00
2144a93627
Mining charges, second try! ( #24790 )
...
* mining charges
* Apply suggestions from code review
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
* span class
* deconstruct comment update
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/items/weapons/explosives.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* ops
* Update code/game/objects/items/weapons/explosives.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/mining/equipment/mining_charges.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-05-02 11:52:00 +00:00
fb027f73dd
Changes the is_changeling and is_mindslave procs into proper defines ( #25212 )
...
* Changes these procs into proper defines
* Henri review
2024-04-28 20:57:26 +00:00
7ab24d6519
fixes tarot card capitalization in uplink ( #25278 )
2024-04-26 20:50:36 +00:00
af5d187014
Adds magic tarot cards [SERIOUS DO NOT CLOSE AFTER AFD] ( #24933 )
...
* starts it
* Update magic_tarot.dm
* MORE PROGRESS
* So many thanks to Cloudbucket, for sprites
* The Work, the Art, continues.
* more changes
* pushes the Work foward. All cards done.
* and more thanks github
* adds to BSH
* tochat
* Finishes QWERTYTODO. Magic key. World smoke
* Isaac and his mother lived alone in a small house on a hill. Isaac kept to himself, drawing pictures and playing with his toys as his mom watched Christian broadcasts on the television. Life was simple, and they were both happy. That was, until the day Isaac’s mom heard a voice from above. “Your son has become corrupted by sin. He needs to be saved.” “I will do my best to save him, my Lord,” Isaac’s mother replied, rushing into Isaac’s room, removing all that was evil from his life. Again the voice called to her, "Isaac’s soul is still corrupt. He needs to be cut off from all that is evil in this world and confess his sins." “I will follow your instructions, Lord. I have faith in thee,” Isaac’s mother replied, as she locked Isaac in his room, away from the evils of the world. One last time, Isaac’s mom heard the voice of God calling to her. “You've done as I've asked, but I still question your devotion to me. To prove your faith, I will ask one more thing of you." "Yes Lord, anything!” Isaac’s mother begged. "To prove your love and devotion, I require a sacrifice. Your son, Isaac, will be this sacrifice. Go into his room and end his life, as an offering to me to prove you love me above all else." "Yes Lord", she replied, grabbing a butcher’s knife from the kitchen. Isaac, watching through a crack in his door, trembled in fear. Scrambling around his room to find a hiding place, he noticed a trap door to the basement hidden under his rug. Without hesitation, he flung open the hatch, just as his mother burst through his door, and threw himself down into the unknown depths below.
* nanny bag it before I forget
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* returns early
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* RE-RE-RE-REVIEW
* 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 >
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com >
* requested changes and such
* duh
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* returns early
* Update code/datums/status_effects/buffs.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* new hrefs here to troll CI :trollface:
* Update code/game/gamemodes/wizard/magic_tarot.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@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 >
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com >
2024-04-24 23:10:46 +00:00
bad8b31afa
Changes all .len to length() where applicable ( #25174 )
...
* Globals work
* Double access works
* All other things
* Revert "All other things"
This reverts commit 6574442eb666401072+Oyu07@users.noreply.github.com >
* Update code/__HELPERS/sanitize_values.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com >
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com >
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com >
2024-04-19 17:32:09 +00:00
c87c5e4e16
Pen resprite ( #24756 )
...
* pens
* fountainpen description
* syndipen in uplink
* Apply suggestions from code review
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* remove spaghetti
---------
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-03-29 15:19:36 +00:00
0a16d6e9ec
Adds the Proto-Adrenaline Bio-chip ( #24716 )
...
* Adds the Proto-Adrenaline Bio-chip
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-03-27 05:52:33 +00:00
0d27af414c
Adds the Organ Extractor ( #24100 )
...
* Adds the Syndicate Organ Extractor
* ipc moment
* fix bug, prevents putting organs in dead bodies to extract
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* renames sprite
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* replace xx yy
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-03-20 20:10:53 +00:00
e32544e599
#undef is now required for all file defines ( #24091 )
...
* CI
* undef
* hooooly crap
* yeah
* false by default
* fixes
* alright, there we go
* oops lmao
* lol, lmao even
* proper programming
* fix
* losin my mind
* oops
* yeah coloring
* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
2024-03-11 14:03:30 -04:00
43b21009a2
upps it to 20 ( #24364 )
2024-03-10 18:02:53 +00:00
d7c7cacc52
Adds The Qani-Laaca Sensory Computer and mephedrone. Ready for review into merge ( #23926 )
...
* Surely this will not have any critical balance implications
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* oops
* marm fixes
* fixes signal
* how on earth did I do that
* adds twitch to nanocalcium
* respect armor, lowers throw
* IPC can use, fuck up heartless people
* no crawl slowdown / meth
* *slightly* turns down the drug effect
* renames it will deal with pr desc soon
* finishes it
* rnd version empable
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Nerfs twitches visuals, due to a reported novastation bug where the visuals would endlessly stack
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* C-C-C-Changes
* Epilepsy Warning: Drug has vibrant visual effects!
* safety
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* removes twitch name, make mix explode
* oops
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-03-06 13:25:38 +00:00
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
1f3e991b2a
Smoke Grenade Module + Blob Buff ( #24224 )
...
* is good for you
* DESCRIPTION
* fix
* Update code/modules/mod/modules/modules_security.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-03-01 12:38:09 +00:00
6910d716dd
Adds the modsuit Chameleon Module ( #23411 )
...
* Adds the modsuit Chameleon Module
* Update code/datums/uplink_items/uplink_general.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/datums/uplink_items/uplink_general.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* even clearer
* Update code/datums/uplink_items/uplink_general.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-02-27 18:17:34 -05:00
ac32162dbc
Adds the razorwire implant. Ready for review into merge ( #23911 )
...
* Please merge 23876 first thanks
* whoops / fix
* she snakes on my case till I
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* deconflicts, ready for TM
* Update code/_onclick/click.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* lewcs good to them
* icon move and changes
* almost forgot to save this
* Update augments_arms.dm
* Inverted it, it seems.
* fixes lockers
* razorwire failsafes
* fuck
* razorwire one hand
* removes 2hand implant stuff
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* s34ns changes
* Vampires can gain blood for a minute from people who succumb
* Revert "Vampires can gain blood for a minute from people who succumb"
This reverts commit 50a3cf87fe108773801+DGamerL@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-02-21 22:51:33 +00:00
c398e4a617
Adds 2 cybernetic implants, makes emag_act return TRUE ( #23876 )
...
* Adds 2 cybernetic implants, makes emag_act return TRUE
* the rest of the fucking owl
* yeah that would do it
* remove this
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* request changes, scaling burn damage, 3 tile range, lowers tech level
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/structures/crates_lockers/crates.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update scanners.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Lewcs good to them?
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* fuck me
* there are no message admins in ba-sing
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-02-08 12:52:11 +00:00
Contrabang