Commit Graph

407 Commits

Author SHA1 Message Date
SkyratBot a05f7e863a [MIRROR] Fully implements the ID Card design document (#3729)
* Fully implements the ID Card design document

* Oh fuck that hurt.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-03 01:54:25 +00:00
SkyratBot 290a1dcb12 [MIRROR] Power Sink Rebalance (#3636)
* Power Sink Rebalance

* Update uplink_items.dm

Co-authored-by: Burgermancoding <79515258+Burgermancoding@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-02-25 16:37:19 +00:00
Gandalf 1a5d92958f 45 TC traitor update (#3356)
* Update uplink_items.dm

* a

* Update uplink_items.dm

* Update uplink_items.dm

* Update uplink_items.dm

* Update uplink_items.dm

* Update uplink_items.dm

* Update modular_skyrat/master_files/code/modules/uplink/uplink_items.dm

Co-authored-by: Swiftfeather <jackwars4@gmail.com>

* Update antagonists.dm

* Update uplink_items.dm

* Update uplink_items.dm

* Update uplink_items.dm

* Update antagonists.dm

* Update modular_skyrat/master_files/code/modules/uplink/uplink_items.dm

Co-authored-by: Swiftfeather <jackwars4@gmail.com>
2021-02-21 14:22:05 +00:00
Swiftfeather f39c5d0a63 resets ocd to tg standard (#3539) 2021-02-20 16:18:22 +00:00
Tom a6886dce5c removes ocd device (#3487) 2021-02-18 18:07:31 +00:00
SkyratBot 0cf8d6a649 [MIRROR] Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#3403)
* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#56754)

* Gives the sniper rifle a suppressor overlay so that it no longer shows up as missing a sprite, also fixes donksoft pistols by repathing them from pistols over repathing them from toy saber smgs. Creates a flag for checking if a gun needs a toy overlay, so it is handled in the parent.

* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols

* Update maint_loot_common.dm

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 17:48:59 +00:00
SkyratBot b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +00:00
Gandalf 7522def83c Uplink Modularisation (#3349)
* a

* Update uplink_items.dm

* Update uplink_items.dm
2021-02-13 11:11:44 +00:00
Swiftfeather 5f753ad3b3 Adds MORE items to the traitor uplink v.2! (#3236)
* Adds all the changes I made in my previous PR

I may or may not have had an issue and completely deleted my repo due to some pretty serious bugs in my test environment, so I redid all the uplink changes plus took the feedback given by maintainers.

* removes clown weapons from clown

I was having issues spawning these items for clownops ingame and don't feel that I should be adding two more items to the uplink without doing it modularly, so I will do these things later.
2021-02-10 19:34:54 +00:00
SkyratBot b3e8ecac81 [MIRROR] M90 changes (#3227)
* M90 changes (#56667)

The m90 is now 14tc instead of 18. Its grenades can be bought from the uplink in boxes for 6tc, instead of individual grenades for 2tc each. You can also fire the m90's grenade launcher with right click.

* M90 changes

Co-authored-by: TJatPBnJ <69724863+TJatPBnJ@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-09 16:49:21 +00:00
Swiftfeather 1537f47652 Add and Removes items from the uplink list (#3159)
* Changes items listed in uplinks.

Increases price on powersink to 18 TC until a change is made to make them beep or actually explode.
Readds Gloves of the north star, albeit for 12 TC instead of 8
Removes blast cannon
Removes the bear trap's clown restriction
Removes the Organic Resources Disturbance Inducer's HoP and QM restriction.
Removes the Roboticist/RD restriction on the laser arm
Removes role restriction on the magillitis serum
Removes the Reagent Dartgun's Chemist/CMO/Botanist restriction
Adds the Syndicate Combat Medic Kit to the normal traitor uplink
Adds elite syndicate hardsuit to the normal traitor uplink for 14 TC

* increase ORDI price

price increased from 2 to 5

* Changes limit of ORDI to 3

Since multiple people may wish to purchase one, and it might add some interesting happenings, limited_stock has been increased from 1 to 3
2021-02-07 16:13:42 +00:00
SkyratBot 23da06b23b [MIRROR] Remove adrenal implant and associated reagent (#3121)
* Remove adrenal implant and associated reagent (#56649)

* Remove adrenal implant and associated reagent

Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
2021-02-05 22:06:32 +00:00
SkyratBot 7f7252d855 [MIRROR] Adds logging to uplinks, spellbooks, and the codex ciatrix (#2937)
* Adds logging to uplinks, spellbooks, and the codex ciatrix (#56450)

* Initial logging

* Bugfix and adds uplink logging to config file

* Another bugfix

* Adds logging to uplinks, spellbooks, and the codex ciatrix

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-01-29 14:12:01 +00:00
SkyratBot 4b350667c8 [MIRROR] Add deathrattle implant for nuclear operatives (#2810)
* Add deathrattle implant for nuclear operatives (#55903)

Deathrattle implant, comes in box of 8, implant yourself and others, and
you'll get a little notification when they die.

Intended for nuke ops, price around the same as the codebook, since it's
a utility communication item, that actually "plans to fail", so it can't
be too expensive, because it doesn't help them win, just lets them know
how much they are losing by.

* Add deathrattle implant for nuclear operatives

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-01-21 14:20:49 +01:00
Seris02 4679542598 removes australicus slime extract injector (#2655) 2021-01-18 18:04:58 -06:00
SkyratBot 1066518044 [MIRROR] Makes the rest of large guns bulky (sans traitor objectives and a few others) (#2733)
* Makes the rest of large guns bulky (sans traitor objectives and a few others) (#56132)

## About The Pull Request

What it says on the tin.
Practically everything but pistols, SMGs, and traitor weapons can no longer be stashed into bags.

I had considered making some large guns that traitors can order (like the blast cannon) also bulky, but concealment is important for some of those things.
However, the bulldog shotgun and sniper rifle have been made bulky, because they're shotguns and sniper rifles!

Traitor objectives are still normal size and can fit in backpacks.

## Why It's Good For The Game

Makes previous changes to weapons and thus balance consistent across our full list of guns. Players can clearly understand what can fit in the bag based on the size of the weapon.

* Makes the rest of large guns bulky (sans traitor objectives and a few others)

* Update special.dm

Co-authored-by: Cartographer-D <63861499+Cartographer-D@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-17 13:16:03 +01:00
SkyratBot fcb914c86d [MIRROR] Adds 25 person pop requirement for Sleeping Carp (#2521)
* Adds 25 person pop requirement for Sleeping Carp (#55953)

## About The Pull Request
!!IDED TERRITORY YE HATH ENTERED THY SALT ZONE!!
Adds a 25 person purchasing limit to the Sleeping Carp scroll. This brings it in line with a other murderbone items like deswords.

## Why It's Good For The Game

As of late, I've noticed a trend on lowpop. Some will buy carp and kill the majority of the station, unable to be opposed as there are very few able to. This is unfun and I find it to be unbalanced, given how strong carp is in one-on-one engagements.

* Adds 25 person pop requirement for Sleeping Carp

Co-authored-by: Coffee <CoffeeDragon16@gmail.com>
2021-01-06 04:41:48 +01:00
SkyratBot 888202da82 [MIRROR] Add "Implant" to list of uplink locations (#2371)
* Add "Implant" to list of uplink locations

* a

Co-authored-by: coiax <yellowbounder@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-30 22:33:27 +01:00
SkyratBot 9463423a05 [MIRROR] Syringe gun and rapid fire syringe gun nerfs, uplink reagent gun buffs. (#2285)
* Syringe gun and rapid fire syringe gun nerfs, uplink reagent gun buffs. (#55642)

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>

* Syringe gun and rapid fire syringe gun nerfs, uplink reagent gun buffs.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
2020-12-23 06:27:38 +01:00
Azarak c3e57a2cdf Update uplink_items.dm (#2072) 2020-12-07 18:11:50 -06:00
Azarak 2482531f46 Update uplink_items.dm (#1995) 2020-12-01 20:32:21 +01:00
SkyratBot c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
Azarak 3ab7fb39c9 Update uplink_items.dm (#1981) 2020-12-01 03:17:24 +00:00
Azarak b989accb77 [NON-MODULAR] The 30TC traitor update (#1744)
* a

* Update uplink_items.dm

* Update uplink_items.dm

* aaa

* Update uplink_kits.dm

* Update uplink_items.dm

* Update uplink.dm

* Update uplink_items.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-11-29 16:09:02 +00:00
SkyratBot 7d653f1f6b [MIRROR] Moves grown food to newfood (#1794)
* Moves grown food to newfood (#55040)

Moves grown food to newfood
Gives trash element support for callbacks for item creation override

* Moves grown food to newfood

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-11-23 22:35:35 +00:00
SkyratBot 13b96bfe01 [MIRROR] Rebalances space loot and space exploration (#981)
* Rebalances space loot and space exploration (#53916)

* Rebalances space loot and space exploration

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-25 14:34:13 +02:00
SkyratBot cd0d700a85 [MIRROR] Mecha refactor 2020 (#579)
* Mecha refactor 2020

* Update effects.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-02 02:16:51 +02:00
SkyratBot 5224ea87de [MIRROR] Misc grammar fixes to plasmaman suits and jaws of life (#529)
* Misc grammar fixes to plasmaman suits and jaws of life (#53179)

* Misc grammar fixes to plasmaman suits and jaws of life

Co-authored-by: msgerbs <msgerbs@users.noreply.github.com>
2020-08-27 03:06:58 +02:00
SkyratBot 692c80e55d [MIRROR] Disposable Sentry Gun Deployment System (#495)
* Disposable Sentry Gun Deployment System (#52931)

Adds a new engineer only traitor item, the disposable sentry gun deployment system. It's a red toolbox that works and functions as a normal toolbox, until you attack it on harm intent with a wrench. Upon bashing it with a wrench, the toolbox will transform into a ballistic sentry gun, theoretically shooting at your enemies, and not you. The turret only has 100 health however, so it will not last long to anyone with any weapon that can deal enough damage.

* Disposable Sentry Gun Deployment System

Co-authored-by: Paxilmaniac <57122098+Paxilmaniac@users.noreply.github.com>
2020-08-24 23:53:10 +02:00
SkyratBot a3258e5488 [MIRROR] Syndicate EMP bomb (#476)
* Syndicate EMP bomb (#53115)

Adds a version of the syndicate bomb that produces a large EMP effect instead of exploding. costs 7tc with a stock of 2.

* Syndicate EMP bomb

Co-authored-by: GuyonBroadway <guyonbroadway@gmail.com>
2020-08-23 20:27:50 +02:00
SkyratBot ee324ab3c2 [MIRROR] Cleanup up all instances of using var/ definitions in proc parameters. (#240)
* Cleanup up all instances of using var/ definitions in proc parameters. (#52728)

* var/list cleanup

* The rest of the owl

* plushvar bad

* Can't follow my own advice.

* Cleanup up all instances of using var/ definitions in proc parameters.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-08-07 18:26:21 +01:00
SkyratBot f9790d97a9 [MIRROR] Implements job skillchip framework as per hackmd.io design document (#212)
* Implements job skillchip framework as per hackmd.io design document (#52630)

* Shift wire revealing logic to dedicated proc

* Bit of code modification. Framework for roundstart job skillchips.

* Implement roboticist skillchip trait functionality.

* Feex moth feet messup

* Add skill chips to robodrobe inventory

* Code refactor. Add missing skill_stations to Pubby and Delta.

* Implement special flags, changelings inherit skillchip skills

* Additional code refactor. Traitor chameleon skillchip framework.

* Implement traitor skillchip, fix up more code, move job chips to outfit datums

* Modify autosurgeon, create skillchip variant, add to uplink

* Implement chip cooldowns. Add new skillchip for station engineers. Cleanup some code. Add job chips to lockers.

* Feex

* Feex

* Code review implementation

* More feexes, improved chameleon chip code and more.

* Code review and minor refactor

* Additional review fixes, rebuild tgui

* Minor logic fixes

* Final Rohesie review

* Robust code changes, improved slot/complexity system.

* Rebuild tgui

* Code review

* Brain regeneration failsafe

* Lazylist cut fix

* Implements job skillchip framework as per hackmd.io design document

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-08-06 01:03:04 +01:00
ArcaneMusic aade6fcdd3 Adds an metric ton of belt sprites and suit sprites for worn objects. (#52390)
* Plant Belt sprites are fixed, Engy Sprites too

* I did belt sprites until my eyes started hurting
2020-07-25 01:59:31 -04:00
skoglol f5cd45f7f7 Removes forcesay on attack (#52341) 2020-07-22 04:30:30 -04:00
jdawg1290 62676e72a8 Force LF line endings with gitattributes and convert repo (#52266)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-16 03:02:40 +03:00
Iatots ebe03d998b Update uplink_items.dm 2020-07-10 23:02:16 +02:00
Orchian d04c6f488d Occupational Corruption Device (#51884)
About The Pull Request

Adds a new traitor item exclusive to Heads of Personnel and Quartermasters that triggers a bureaucratic error
Why It's Good For The Game

Adds a new method for traitors to cause indirect havoc to the station at large
Changelog

cl
add: Added a new traitor item for HoP and QM, the OCD
/cl
2020-07-07 10:53:21 +12:00
EdgeLordExe 3b24a4fe2f Miner to cook : Miner changes continue! (#51924)
About The Pull Request

Miners can no longer get meat hook from necropolis chest, it was moved to being a cook traitor item that costs 11tc. You know it is literally called meat hook, it is thematically better as a chef weapon.
Why It's Good For The Game

Why? just why? Who the fuck would give miners a weapon that is completely useless against lavaland mobs, but is incredibly good at killing people.
Changelog

cl
balance: Meat hook is now a 11tc cook traitor item. It can no longer be aquired from necropolis chests. sorry miners!
/cl
2020-07-07 10:51:16 +12:00
Iatots b34c75420b Traitor Research Directors can now order laser arm implants (#51883)
As heads of the science department and overseers of robotics, traitorous Research Directors can now order laser arm implants, an item previously exclusive to traitor roboticists.

*Why this is good for the game:*
Gives a hardly used items more chances to be used, removes exception to the rule of "traitor heads get their underling's selections too".

🆑 Iatots
   rscadd: Traitorous research directors can now order the laser arm implant from their uplink, like roboticists.
  /🆑
2020-07-04 05:27:28 +02:00
Paxilmaniac 54572041bd Adds smg to replace the mosin as nuke op surplus gun. Remake of #51285 (#51314)
* github makes my brain hurt

i managed to completely fuck over the last branch

* gun inhands

please god travis dont fail

* just learn the recoil pattern like cs:go bro its not that hard

5 more spread

* wtf appveyor

capitalizes the magazine name to make appveyor run again

* those were, in fact, not the correct inhands

dont know how i fucked up the arg inhands, urg moment indeed

* Update code/modules/projectiles/boxes_magazines/external/smg.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* fixes a minor sprite fucky wucky

would have helped if i actually tested if the sprites work

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-06-22 16:25:39 -03:00
nemvar b87f65d95e Converts ALL typepaths to lowercase (#51642)
* Case of lower

* More changes

* Ruins the nice 420 diff, brainfart when doing the second batch of conversions

* More changes

* Next batch. I think

* Converts even more paths

* Restarts bots

* Capital Free Zone

* Come on travis, do something

* Renames areas

* Bots, please stop dying

* Updates CONTRIBUTING.md and updates a few paths I missed.

* APC recgarftzfvas
/obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
2020-06-17 20:47:57 -03:00
ShizCalev 1059a64a98 I before E, except after C. (#51543) 2020-06-10 23:23:50 +02:00
Fikou d804b2d444 removes a lot of free illegal tech items (#51357) 2020-05-30 16:37:52 +02:00
GhostEcho 289839c6ea Increase Carp PRice by 1tc (#51330) 2020-05-30 11:06:52 +02:00
Ryll Ryll 31ea796672 Removes sleeping carp's hidden damage resistance + 40 brute crit punches, lowers price (#50904)
* remove resist and crit

* grammar
2020-05-25 07:16:39 +02:00
nemvar 6ef421be42 Renames a few variables. Also reorders icon fallback order again. (#51060)
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
2020-05-25 06:47:19 +02:00
spessman-007 5ae305ec9f Resolve issues with incorrect usage of a/an (#51095)
Co-authored-by: NewSta <spessman-007@users.noreply.github.com>
2020-05-25 01:34:34 +08:00
Dionant 0d6c16a812 Rename uplink 10mm ammo. (#50890) 2020-05-05 17:35:32 -07:00
necromanceranne 0eaf4ca0df Various Antagonist Handgun/Rifle changes; Stechkin, Stechkin APS, c20-r, m90gl (#50734)
* overhauls the crap out of a lot of antag guns and their ammo

* Should probably shoot an additional bullet per squeeze at this point

* nyoops

* So travis will stop yelling at me for new lines

* Should be all I need to fix for maps

* Touches up the stechkin sprite again

* Increased the fire rate and spread of the APS and the spread of the m90, added additional magazine types for the APS and added incendiary mags into the Spetznaz bundle to retain the fire theme, added phasic m90 ammo that penetrates through all surfaces but does significantly less damage available to ops for 8 tc, tided up the code for the aps a little more and also it's sprite.

* fixes some stuff

* So travis will cease screaming

* Changed how the phasic bullets work to being closer to xray beams, added additional flags to allow the bullets to pass through structures and machinery

* Update code/game/machinery/_machinery.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/game/machinery/_machinery.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/game/machinery/doors/door.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/projectiles/boxes_magazines/external/pistol.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/game/objects/structures.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* updated the gun sprites a bit more

* Hopefully this fixes the conflicts?

* Update code/game/machinery/doors/door.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* More updating, fatter stechkin sprite

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-05-04 06:21:14 -03:00
Fikou 1792d0529b changes geneticist uplink item availability to rd instead of cmo (#50713) 2020-05-01 05:21:45 -03:00