Commit Graph

67 Commits

Author SHA1 Message Date
SkyratBot
d7ef0f27cb [MIRROR] Converts all research categories into defines [MDB IGNORE] (#15599)
* Converts all research categories into defines

* this took an hour

* h

* update research categories include

* update research categories include

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-08-17 17:16:38 +00:00
Zonespace
a09ceef779 Relabels some guns' gun companies (#15034)
* this bothered me for ages

* whoops
2022-07-19 15:00:50 +01:00
Pinta
a4a6bccdcc [MODULAR] Adds 9x19mm Peacekeeper and 10mm Auto ammo to autolathes (#14252)
* Update autolathe_designs.dm

* Apply suggestions from code review

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-06-11 18:18:07 -07:00
SkyratBot
d2e1be321f [MIRROR] Refactors Gunlight / Helmetlight to be a component [MDB IGNORE] (#14226)
* Refactors Gunlight / Helmetlight to be a component

* wew

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-06-10 20:49:38 +01:00
ErdinyoBarboza
ba3f2dea50 [MODULAR] [READY] Shotgun Rework (#13736)
* hnnh

* shotgunneryv1

* shotgunnery1.5

* 14gauge

* more14g

* shotgun

* gun

* Update 14g_shotgun.dm

* shottie

* shottie

* nanomachines

* antitide

* boolet

* designs

* moreshots

* i killed 14 gauge

* iconspart1

* moremoreshells

* iconsinit

* iconp2

* iconfin

* fin

* saneshotgunprices

* smallsanityfix

* thank you softcerv

Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>

* Update bullets.dm

* iwasforcedtodothis

* honk!

* oops

* letsnotembed

* uplink

* hecu

* contrabandshell

* bigdumbass

* revert

* Edited Per Review

* iconfix

Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
2022-06-06 13:26:44 +01:00
Dragonfruits
9f05812950 [READY] GUBMAN 3.4 PART 1: It's Actually Happening (#13138)
* no retrofuture

* Update sniper.dm

* Update akm.dm

* Update p90.dm

* Update m16.dm

* Update ammo.dm

* Update modular_skyrat/modules/gunsgalore/code/guns/akm.dm

* Add files via upload

* Opera GX crashes when I try to upload these icons it's insane

* I accidentally removed an AK mag subtype that was in use. Whoops!

* Use .244 instead of 5.8x42mm for 7.62

* Update guns.dm

* Update guns.dm

* Update guns.dm

* Update modular_projectiles.dm

* Update guns.dm

* Update modular_skyrat/modules/aesthetics/guns/code/guns.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Apply suggestions from code review (thanks t)

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* fix this stupid ass conflict

* and now bring the babies back

* conflict fixer xpress 9000000

* fix stupid conflict

* and now we bring the good stuff back

* Suffering

* PLEASE don't break

* Update guns.dm

* Update guns.dm

* Update guns.dm

* Any conflicts in the chat??

* Update modular_projectiles.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-05-27 19:57:08 +01:00
Tom
6d3a8fbec7 goodbye box comments (#13826) 2022-05-23 17:00:34 +01:00
Tom
f2d3ea41f4 converts unnecessary capitals in names to lowercase (#13676)
* converts unnecessary capitals in names to lowercase

* Apply suggestions from code review

Co-authored-by: Cursor. Maybe? Who knows? <102828457+theselfish@users.noreply.github.com>

Co-authored-by: Cursor. Maybe? Who knows? <102828457+theselfish@users.noreply.github.com>
2022-05-23 11:38:57 +01:00
Pinta
36861c4312 [MODULAR] Adds Sabres in as a cargo goodie. (#13317)
* adds in the sabre

* adds to cargo

* Update melee.dm

* better names and descriptions.

* Update goodies.dm

* uh-oh spaghettios

* textures

* no powercrepe

* going to brown.

* Update belt.dmi
2022-05-07 21:18:00 -04:00
Zonespace
cc728cff02 Fixes freighter boss's ammo (#13393)
* nyeh

* fix
2022-05-07 22:06:11 +01:00
Zonespace
c8532edabd scope (#13115) 2022-04-26 13:39:32 +01:00
Zonespace
349a3325ec Adds Gun Cargo (#12632)
* mega-commit

* js fix 1

* js fix 2

* documentation1

* balance?

* balance pass

* 2 -> 20 mins

* m90 increase

* thanks prophet (balance and stuff)

* more touchups

* mini correction

* cmg update

* tgui fix

* this took me too long

* permit pin removal (testing)

* price bump

* accidental commit

* ammo cheapening

* weh

* this is incredibly embarassing

* woo

* woo

* pepperballs

* permit-pins are lame anyway

* dep guards get permits

* CI fix

* model75 increase

* fix lint

* model75 removal

* Update cargo_stuff.dm

* ZONESPACE REEEEE

* not the bluie's anymore

* interdyne company fixes and stuff

* fix

* fix2

* nagant revolver removal

* threshold changes

* undo

* techshell to dynamics

* mag cost 3.5 -> 3

* dynamics 10mm auto

* ammo gens manifest

* ladon/osprey price changes

* if ixed it for you sir

* assault rifle rebalancing

* review

* Update modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Update modular_skyrat/modules/sec_haul/code/guns/guns.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* weh

* add disabler crates back

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
2022-04-23 17:34:08 +01:00
Tom
c864f5c434 Allows the NT Rep to get more M45A5 ammo (#12957) 2022-04-21 15:53:28 +01:00
Pinta
f7387601cc Moves Cellguns to their own folder. (#12681)
* the great relocation

* Update readme.md
2022-04-13 21:52:57 +01:00
Gandalf
14a60e0557 Fix CI (#12675)
* Update _mutant_robotic_bodyparts.dm

* an awful bug

* Update examine.dm

* Update mediguns.dm

* Update _external_organs.dm
2022-04-11 05:12:40 +01:00
Pinta
bd4e0c0f4f [MOSTLY MODULAR] Oppressive Force Relocation Medicell (#12654)
* start

* It's important to have this be a standard part of every medical doctor's kit

* Update modular_skyrat/modules/modular_weapons/code/medcells.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/modular_weapons/code/medcells.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* fun removal

* removes the fools

* refactors a whole bunch of code

* safety

* Update medcells.dm

* wew boy

* Update medcells.dm

* Update medguns.dm

* adds to techweb

* Update mediguns.dm

* Update medcells.dm

* Update medcells.dm

* Update medcells.dm

* body safety

* Update medcells.dm

* Update medcells.dm

* Update medcells.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-04-11 02:45:26 +01:00
Pinta
f3f5c84e86 [MODULAR] Medigun/Cellgun Code Cleanup (#12520)
* some comments

* I have sinned

* we do a little spacing

* comments

* spaces

* Update medcells.dm

* Update medcells.dm

* more cleaning

* Update cellguns.dm

* Update modular_skyrat/modules/modular_weapons/code/cellguns.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update medcells.dm

* Apply suggestions from code review

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update cellguns.dm

* Update cellguns.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-04-09 00:07:14 +01:00
Gandalf
35f3fa11c8 Upstream merge 65326 (#12460)
* [MDB IGNORE] TGUI library, plus polish

* Update _computer.dm

* Update manuals.dm

* Update medguns.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2022-04-01 01:20:27 +01:00
Gandalf
e2a68d3b15 Assault Operatives (#12126)
* Initial commit

* 0

* shuttle and maps

* Equipping

* Minor fixes, gyrojet removed, elite suits removed

* E

* reviews

* Update base_alarm.dm

* nnfghghg

* more fix

* Update dynamic_rulsesets_roundstart.dm

* Update modular_skyrat/modules/assault_operatives/code/assault_operatives.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/vending_machine.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* fyux

* Update assault_operatives_outfits.dm

* E

* Update modular_skyrat/modules/assault_operatives/code/goldeneye.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/interrogator.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/interrogator.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* more review

* E

* uber update

* Update AntagInfoAssaultops.tsx

* Update AntagInfoAssaultops.tsx

* nyooom

* E

* ICARUS SUNBEAM

* fioxes

* Update sunbeam.dm

* Update goldeneye.dm

* Update vending_machine.dm

* Update assault_operatives_outfits.dm

* Update goldeneye.dm

* e

* eee

* Update assault_operatives_outfits.dm

* Update assault_operatives.dm

* Update assault_operatives.dm

* Update goldeneye_cruiser.dmm

* fix

* 0

* haha funneee

* armament system

* more updates

* f

* e

* 0

* e

* more based

* 0

* e

* CQC PLUS CAN SUCK MY COCK

* Update __armament_bodyarmor.dm

* Update assault_operatives.dm

* e

* MG9 balance

* Update armament_utility.dm

* Update sunbeam.dm

* fixes

* Update CentCom_skyrat_z2.dmm

* Update armament_station.dm

* Update modular_skyrat/modules/armaments/code/armament_entries.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/armaments/code/armament_entries.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/assault_operatives.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* e

* Update modular_skyrat/modules/assault_operatives/code/assault_operatives.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update assaultops_armament_station.dm

* reviuew

* Update misc_items.dm

* Update vending_machine.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-03-28 02:27:25 +00:00
SkyratBot
8477577119 [MIRROR] changes projectile's armor resistance flag to "armor_flag" [MDB IGNORE] (#12234)
* changes projectile's armor resistance flag to "armor_flag" (#65487)

* IHATEVARIABLES

* removes the face

* changes projectile's armor resistance flag to "armor_flag"

* e

Co-authored-by: capsaicinz <84609863+capsaicinz@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-03-23 21:25:41 +00:00
nikothedude
70cabdf311 fix (#12010) 2022-03-12 09:18:11 +00:00
Cimika/Lessie/KathyRyals
a480b91262 Roller bed cells now buckles the mob to the bed if they are not conscious (#10467)
* Roller bed cells now buckles the mob.

* Only buckles people who are not conscious.
2022-01-09 13:20:24 -05:00
ErdinyoBarboza
2d32e6e2ec [MODULAR] Wildcat and Lynx Rebalance + Blueshield Gun Change (#10397)
* Armory Shotgun Fix

* Update guns.dm

* Typofix

* Weapon Weight Rebalance

Makes the Lynx and Wildcat Bulky. They are WT tier weapons and are not meant to be carried in your backpack

* Gives BS one mag of rubbers

* Gives BS a shiny hellfire

Purpose built for BS when its a shoot to kill scenerio
2022-01-04 22:58:15 +00:00
Iamgoofball
0d441af5b1 GoofSec 1.5: Departmental Batons, Departmental Guard Offices, Batons from Backpacks -> Belts, Guard Cuffs -> Cableties, Mapping Icons for Jobs, Belt Reskinning, Brig Officer Baton Change, Sec Medic Gun Removal + Medical Access Removal, Security Sergeant Removal (#9581)
* GoofSec 1.5: Departmental Batons, Departmental Guard Offices, Batons from Backpacks -> Belts, Fixed Security HUD icons, Guard Cuffs -> Cableties, Mapping Icons for Jobs, Belt Reskinning, Brig Officer Baton Change, Sec Medic Gun Removal

* whoops

* 2 lockers instead of 1

* Update modular_skyrat/modules/goofsec/code/department_guards.dm

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>

* Update modular_skyrat/modules/goofsec/code/department_guards.dm

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>

* Brigoff + SecMedic Disablers, Buckshot Removal, Static Armory Spawns, Armory Shotgun Rebalance

* Armory Shotgun Rebalance, Armory Gun Buff, Armory Weapon Distribution Rework, Mag-fed Shotguns Crate, Buckshot/Lethal Slug Removal, Security Sergeant Removal, Ironhammer Reskins, Security Medic Access Nerf

* WHOOPS

* Map fixes

* how could I forget meta

* fukken blueshift i swear to god

* Departmental Baton Verbage tweaks

* Armory Gun Rebalance

* aSDADWDWEFWRGWFD

* Fixed the blueshift edits.

* Removes the Ironhammer reskins, the Shotgun changes, the Buckshot/Slug Removal, and the adjustment to the armory firearms.

* whoops

* fucking

* saefwefqefwgthwgrfwed

* s

* WHOOPS

* whoops

* aaaaa

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
2021-12-27 23:30:05 +00:00
Pinta
9b8ed36fd9 [MODULAR] Medigun Toxin Healing now scales with non-medicine chemicals in bloodstream (#10269)
* Update medcells.dm

* Update medcells.dm
2021-12-25 18:36:08 +00:00
Pinta
ffc5b9c31f [MODULAR][FIX]Body Teleporter Medicell no longer teleports living people (#9947)
* I am but a simple clown

* Update medcells.dm

* Update medcells.dm
2021-12-08 19:35:40 -05:00
Tom
ac56683ea5 Changes a lot of names to lowercase where appropriate (#9631)
* the case-ening

* oops

* Update modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/customization/game/objects/items/plushes.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/modular_items/code/necklace.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/modular_weapons/code/medguns.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_emitter.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Req. changes

* Update modular_skyrat/modules/modular_weapons/code/medguns.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-12-01 16:54:34 +00:00
Pinta
5d611b3afd [MOSTLY MODULAR] Body Teleporter Medicell (#9599)
* adds the base of the cell in

* what if we added visual information in

* makes it more visible

* textures and conversion kit

* adds to techfab

* Update mediguns.dm

* Update medcells.dm

* Update medguns.dm

* Update modular_skyrat/modules/modular_weapons/code/medguns.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/modular_weapons/code/medguns.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/modular_weapons/code/medguns.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/modular_weapons/code/mediguns.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-11-28 14:16:56 -05:00
Tom
21f894e9b8 Spans to procs (#9495) 2021-11-16 23:29:43 +00:00
Gandalf
4a950241b6 [PRIORITY] MODULARISATION AUDIT PART 1: MAKING SKYRAT GREAT AGAIN (#9464)
* EFT

* E

* EEE

* E

* INTO TO ORBIT

* I hate this but I'm going to ignore it.

* Seriously, fuck this.

* Update CentCom_skyrat_z2.dmm

* Update tgstation.dme

* oops

* Update positronic_alert_console.dm

* E
2021-11-16 12:01:30 -05:00
Pinta
d547fa4ceb [MOSTLY MODULAR] Hardlight Rollerbed Medicell (#9394)
* ports over work from before

* makes the roller bed dissappear after a set while

stockpiling is bad

* adds icons and makes it so there is only one bed spawned per turf.

* adds item to techweb

* Update modular_skyrat/modules/modular_weapons/code/modules/projectiles/guns/energy/cell_based/medgun/medcells.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* applies suggestions from code review

* Update medcells.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-11-14 03:13:30 +00:00
Pinta
2e729a9f9c [MOSTLY MODULAR]Hardlight Salve Medicell (#9268)
* base

* removes a lot of vectors for abuse

* adds in globule textures

* empty cell

* adds it to research

* fixes runtime

* oversight
2021-11-06 19:36:40 -04:00
SkyratBot
e90627be0e [MIRROR] Modernizing Radiation -- TL;DR: Radiation is now a status effect healed by tox healing, and contamination is removed [MDB IGNORE] (#9176)
* Modernizing Radiation -- TL;DR: Radiation is now a status effect healed by tox healing, and contamination is removed

* Fixing conflicts

* Makes it compile, yeet all the RAD armor from everywhere (thanks RegEx!)

* Removing more lingering rad armor (woo)

* Damnit powerarmors

* Bye bye rad collectors!

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-02 10:36:46 -04:00
Pinta
6199239241 [MOSTLY MODULAR] Hardlight Gown Medicell (#9021)
* the start

* special text

* Textures

* item deletes once taken off

* medicel icon

* adds it to research

* select color
2021-10-26 17:13:02 +01:00
Pinta
ca4fc14518 [MOSTLY MODULAR][REFACTOR] Changes the way that cell-based guns display the selected ammo type. (#8974)
* hey, it mostly works!

* sprite tweaks

* base colors are in

* This is a better color

* removes images
2021-10-23 00:51:39 +01:00
Pinta
6bb61699a9 [MOSTLY MODULAR][REFACTOR] Refactors Mediguns into a subtype of Cell-Loaded guns. (#8724)
* The start

* More work

* firing modes

* Now displays ammo type when swapping and examining

* code refactoring

* replaces a bunch of code

* custom medicell text

* Update emitter.dm

* removes some testing stuff that isn't needed anymore

* repaths medicells

* This bothered me

* now uses conversion kit framework from https://github.com/Skyrat-SS13/Skyrat-tg/pull/8506/files instead of crafting
2021-10-13 20:20:57 +01:00
Pinta
a1f1442adf Update medguns.dm (#8080) 2021-09-09 23:01:44 +01:00
Pinta
d09b86a15e [MOSTLY MODULAR] Mediguns: The start of utility cells. (#8008)
* we start

* base of coagulant

* coagulant sprite

* temp changes

* Update medcells.dm

* textures

* Update projectile.dmi

* Adds utility cells to research

* forgot an undef

* Apply suggestions from code review

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update medguns.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-09-08 14:48:55 -04:00
Pinta
ea9c1fd12d [MODULAR] Medigun Manual (#8051)
* Update misc.dmi

* Update medguns.dm

* adds them to cases

* Update misc.dmi
2021-09-08 04:16:57 +01:00
Pinta
430137fdf5 [MODULAR] Medicell Safety (#7734)
* adds the base of the toggle

* adds in the ammo type

* feel the burn

* Update medguns.dm

* Update medguns.dm

* rest of the tiers

* whoops, I forgot to add nausea in

* Update medguns.dm

* Update modular_skyrat/modules/modular_weapons/code/modules/projectiles/guns/energy/medgun/medguns.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* span notice

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* start of abstraction

* Disgust abstraction

* turns the checks to make sure the patient is living into a proc

* Revert "Disgust abstraction"

This reverts commit 357f35689a68713c6e9c07c1a1b822e58860139f.

* weh

* clone damage

* Update medcells.dm

* replaces a bunch of stuff

* fire

* applies to the rest of brute and burn cells

* more code cleanup

* Update medguns.dm

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* turns brute healing into a proc

* Burn

* Toxin

* Update medcells.dm

* Update medcells.dm

* Burn

* Oxygen

* toxin

* safe brute

* burn

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-27 21:55:37 -04:00
Pinta
426437f908 [MODULAR][Balance] more Medigun Balance. (#7628)
* Clone damage is now a thing

* Nausea

am probably going to want to tweak the values on this

* base chemical requirements

* Update mediguns.dm
2021-08-21 22:23:22 +01:00
Gandalf
a43b8c5fc4 Nanotrasen Fleet Command Expansion (#7418)
* A

* Update centcom_computers.dm

* a

* Update CommandReportConsole.js

* commandreporter

* Update command_report_computer.dm

* a

* FEET COMMAND

* a

* e

* e

* Update departments.dm

* F

* a

* a

* Update new_player.dm

* Update new_player.dm

* AAAAAA

* Update zombie.dm

* Update zombie.dm

* aaaaaaa

* 0

* a

* Update CentCom_skyrat.dmm

* aa

* Update nsstitan.dmm

* A

* Update station_goal_computer.dm

* Update station_goal_computer.dm

* Update bridge_officer.dm

* Update CentCom_skyrat.dmm

* Update pda.dm

* Revert "Update pda.dm"

This reverts commit fbe1823726f9edb7f7c3ba03c2d34b08b46ae294.

* logic

* cargo system

* 0

* Update import_console.dm

* Update cargo_skyrat.dmm

* noob coder

* Update cargo_shuttle_console.dm

* a

* Update deck_crew.dm

* Update export_console.dm

* Update deck_crew.dm

* 0

* Update CentCom_skyrat_z2.dmm

* AAAA

* 0

* Update CentCom_skyrat_z2.dmm

* Update cargo_shuttle_console.dm

* Update CentCom_skyrat_z2.dmm

* a

* SELLING CREW IS BAD.

* a

* Update supply.dm

* Update CentCom_skyrat_z2.dmm

* Update supply.dm

* A

* a

* a

* Update zombie.dm

* Update modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-17 18:43:19 +01:00
Pinta
55e279e3f2 [MODULAR][FIX/QoL] Mediguns eject Medicells into hands before the floor. (#7494)
* Update medguns.dm

* aaaaaaaa
2021-08-10 23:24:55 +01:00
Pinta
6060e36480 [MODULAR][Sprites] New Medigun Sprites (#7482)
* Adds in the cell textures

* Update projectile.dmi

* Gives the briefcases unique textures
2021-08-10 15:57:32 +01:00
Pinta
3980643316 [MODULAR] Minor Medigun code improvements (#7463)
* removes duplicate w_classes

* Why is this here?

* adjusts some names and descriptions
2021-08-08 16:01:43 +01:00
Pinta
ceb703b6ff [MODULAR][FIX] Fixes Medigun causing runtimes (#7437)
* we start

* Update medcells.dm
2021-08-06 23:24:36 +01:00
Tom
bf41390815 Gives Lynx and Wildcat safeties (#7296) 2021-08-01 14:15:36 +01:00
Pinta
b0ec646811 [MODULAR] The start of Medigun changes (#7256)
* The first step

* Completely removes corpse mend

* Makes mediguns less spammy and more impactful with each shot

a slight delay has been added to the gun to balance out the more potent shots

* Nerfs the healing for Brute and Burn

* Cells are no longer included with the crate

* we begin

* The rest

* Update modular_skyrat/modules/cargo/code/packs.dm

Co-authored-by: Matthew J. <12817816+ZephyrTFA@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Matthew J. <12817816+ZephyrTFA@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Matthew J. <12817816+ZephyrTFA@users.noreply.github.com>

* no longer works on borgs

* Update modular_skyrat/modules/modular_weapons/code/modules/projectiles/guns/energy/medgun/medcells.dm

Co-authored-by: Matthew J. <12817816+ZephyrTFA@users.noreply.github.com>

Co-authored-by: Matthew J. <12817816+ZephyrTFA@users.noreply.github.com>
2021-08-01 11:57:34 +01:00
Pinta
b2d98480a3 Update medguns.dm (#7246) 2021-07-30 12:19:11 +12:00
Pinta
3c1b46d43a [MODULAR] MEDIGUN FIXES AND TWEAKS (#7219)
* increases price by 2x

* Holy cow it was not meant to charge this fast

I thought the charge-rate wouldn't be affected by the capacitor used. I was wrong, dead wrong. Fixes the charge time.
2021-07-29 11:11:36 +01:00