About The Pull Request
This PR adds several (terrible) unique sprites for all the combat hypos and medipens that just used the default instead, and tweaks some minor stuff like making descriptions more truthful and moving the one-use gorilla pen and combat holy water injector where they should be.
The new medipens are just recolors of the epipen, since that's the template used for the leporazine pen too (whose icon i deleted since the pen doesn't exist anymore). For example:
image
Why It's Good For The Game
These changes are intended to make each hypo stand out, so they don't all share the same sprite. It also adds a lot of inhand sprites (equally as bad in quality), so a knowledgeable player can, for example, notice they just got stabbed with a gorilla pen, or just know that they got injected with something healthy and not poison.
Changelog
cl
imageadd: added some icons and images for hyposprays and medipens so they stand out
tweak: tweaked a few descriptions on said hypos so they better describe the contents
/cl
these sprites are kind of terrible, but i think they're better than every single pen and combat hypo using the same icon. any new sprites would be highly appreciated, especially for these two
* Payment generation rework and no repeated target
* Blacklist
* Remove pod explosion
* contractor baton
* darker highlight
* Slight increase for the higher paying contracts
* Victims get healing injected to bring them out of soft crit/crit
* pod send fix
* Text changes
* More text tweaks
* New baton - custom sprite/sound
* Better sound - fixes
* Stutter
* text
* classic_baton rework
* attack silicons still, and only show charging for new baton
* Properly attack/stun silicons where appropriate
* . list
About The Pull Request
I was dumb and made the last PR from my master branch instead of a branch branch, see #44774 for past discussion
Makes the Mosin Nagant rifle bulky instead of normal sized, but allows you to saw them off much like your average shotgun to normal size. However, sawing it down will introduce bullet spread because of the drastically reduced barrel.
Why It's Good For The Game
The Mosin Nagant is a really fucking big gun, 48.5 inches in its full length model, and with a bayonet attached it can reach near 6 feet long in total. Item size isn't 1:1 with real life, but considering just how notorious they are for being really big, paying homage to it feels right. Plus, running around with sawed off guns feel much more illegal and thus fun.
Changelog
cl Shaps/Ryll
tweak: Mosin Nagants are now bulky, but can be sawed off to fit in a bag
/cl
About The Pull Request
Adds an ammo system and printable ammunition to most mech weapons with a "rearm" function. Replaces the old system of generating ammo at a power cost. With the exception of the missile launcher and clusterbang launcher, all affected weapons have a storage capacity of ammunition equal to four-times the amount of ammo that the weapon can load (though the storage cache starts with only one full reload when printed from the mechfab). Ammo boxes are printed from the mechfab and also are available in the Sec protolathe, and each box will carry exactly one full reload. Ammo boxes are not terribly expensive, but reloading requires either an ally on foot to pop the ammo box in, or for you to hop out and do it yourself.
Missile tubes and the clusterbang launcher do not have an ammo storage cache, and so reloading them will reload the tubes directly. This is not the full extent of nerfs that the missiles need (I will do those in a separate PR since I suspect this one will be controversial) (read below), but removing the ability to reload missile pods without an ally or exiting the mech may help a bit.
The SRM-8 has been replaced with the new BRM-6 in tech webs. The BRM carries a smaller explosion and does not explode unless hitting a wall, door, shutter, or another mech, and only has six shots. The SRM-8 remains on the Mauler mech. If the BRM missile does not explode, it will deal 30 brute damage instead, and break.
Why It's Good For The Game
Currently, mech ballistic weapons function like reloadable lasers. You have an ammo counter, but it's one hundred percent based on your energy cell. This gives some flavor to ballistic weapons, making them actually feel different, and gives them a mini-niche in the form of good choices to use alongside an energy-draining mech ability (like the Gygax speed).
Use lasers when you won't need to worry about power and/or need burn damage.
Use ballistics when you want to save power and/or need brute damage.
The SRM-8 to BRM-6 change is being done here so that I don't have to wait until this PR is merged before starting it. The idea is to keep the reasons why you'd want to build a missile launcher (wall breaking and mech fighting) without also outclassing most other weapons burst damage potential. I'm not truly happy that the explosions deal zero damage to surrounding people even one tile away, but dealing no damage is better than the massive damage + stun that the current missile launcher does. Nuke Mauler has the old launcher, since I believe the consensus is that Nukie Mechs are already not generally worth the money.
Changelog
cl
balance: Mecha ballistics weapons now require ammo created from an Exosuit Fabricator or the Security Protolathe, though they will start with a full magazine and in most cases enough for one full reload. Reloading these weapons no longer chunks your power cell. Clown (and mime) mecha equipment have not changed.
balance: The SRM-8 Missile Launcher has been replaced with the BRM-6 Breaching Missile Launcher in techwebs (Nukie Mauler remains equipped with the SRM-8).
balance: Both Missile Launchers and the Clusterbang Launcher do not have an ammo cache, and cannot be reloaded by the pilot. Once the initial loaded ammo has been spent, you can use the appropriate ammo box to load the weapon directly.
add: Utility mechs that have a clamp equipped can load ammo from their own cargo hold into other mechs.
add: Nuke Ops can purchase spare ammo duffel bags for their mecha weapons, should they run low.
/cl
To-Do:
Add ammo to security protolathe
Get better ammo box sprites (hopefully)
Possibly adjust ammo counts for balance. Might make the flashbang launcher and/or cluster launcher behave like the missile pod.
Add functionality for the utility mechs to use clamps to load ammo from their cargo hold into another mech.
Ammo counts, for anyone wondering:
Weapon Magazine Size Total ammo at start* Maximum total ammo*
Scattershot† 40 (10) 80 (20) 200 (50)
Hades 24 48 120
Ultra AC 2† 300 (100) 600 (200) 1500 (500)
BRM-6 Missile Rack 6 6 6
SRM-8 Missile Rack 8 8 8
Flashbang Launcher 6 12 30
Cluster Launcher 3 3 3
*Total ammo is the amount in the weapon's magazine plus the stored ammo.
†The Scattershot lists its ammo as 40, but uses four per shot. So in reality, a single full reload gives you ten shots. Similarly, the UAC2 fires in three-round bursts, and so 300 rounds is 100 bursts.
Clown weapons (and the mime weapon) are all unaffected by this change.
* QoL and location bugfix
* QoL and bugfixes
* Further fixes
* Name fix
* Text changes
* revert delay
* Same fix for returning
* description update
* New TC generation
* Slight delay for ransom cut, so they can hear the beep
* Give a written guide
* Third item
Alright I'm sold, let's try it
* Forgot to add text changes in line with the new item
* Merge conflict
* In datum
cl Floyd / Qustinnus
add: New scientist traitor item: Australian Slime Mutator / Spider Injector, use it on a gold slime extract to create 3 neutral broodmother spiders, make them sentient and start your own hive.
/cl
'ello mates, Me and my syndicate expedition team have recently returned from my journey to the Australicus sector and crikey the spiders are big there. Fucking the size of a bear. Luckily one of my fellow expeditioners managed to knock one of the fuckers out with a boomerang and we took 'er to our labs. We managed to extract some of their extract which is known to create tame offspring when injected into a gold slime core.
However, if you give it sentience and tell it to do whatever you want, maybe you can use it for a useful purpose?
10 TC item, lets you inject a gold-slime core for some midwife/broodmother spiders that can help you start a spider army. Price can be raised if people think 10 is too little. It spawns 3 instead of 1 to keep consistent, but it can be lowered to 1 spider.
* Emag bounty computer to show contract connection
* Corrupted text helper
* WIP on corrupted text
* Randomly corrupt text when looking at connect screen
* Barebones accessible Syndicate bounties screen
* Contract barebones and Synd UI work
* Further text changes, antag checks
* Further UI changes, full contract generation with areas/target
* dropoff point checks, and move to uplink item for requesting bounties
* WIP contract uplink item
* Contract uplink and continued contract improvements
* Completed contract uplink, and continued contract work
* Droppod WIP
* Further droppod work
* Mob WIP
* Further mob WIP
* No mob
* Callback for putting in mob
* Further WIP with pod checks
* Better location picking and signal fix
* Further pod changes, WIP of payouts
* Overall finished payment/contract system
* Code cleanup
Revert changes to bounty console
Remove debug messages
* Small refactor
* Add kit with set and randomised items.
* Fix box
* Very minor flavor text for inserting into pod, plus roundend text
* Pod return sound
* Contract uplink slight styling changes
* We don't keep giving telecrystals until they literally can't hold anymore
* Ship them off to ninja base instead
* Nerf bring them dead, but give a nice boost for bring them alive
Overall this is a nerf, so we also throw in an agent card to the bundle
* Ship them back
* Minor text changes and slight TC change
* Always give the black and red variant space suit
* Error sounds
* Dropoff area locator
There's sometimes duplicates, i.e. security office - but only one of them will work. This shows you where to go.
* Small fixes
* Bugfix, further changing of TC
* Ransom wip
* Ransom system
* Few changes
* Properly pay for ransoms and appropriate logic for dropoffs
* Terminal sounds
* Talk on command channel when ransom is given, or if they were too late
* Change to announce system
* Announcements/auto pay ransom
* Proper wait
* Name pods properly
* Don't send blacklisted items
* fix
* Improvements
* Announcements are less huge...
* Not a file...
* Improvement
* Drop them not in a wall
* Halves eye blur and styles payment vend
* No memes allowed
About The Pull Request
This replaces the 3 individual discounts on each nukie uplink with two shared pools of discounts. There are 5 unlimited stock discounts and 10 limited stock discounts. Amounts subject to change and debate.
Why It's Good For The Game
Changelog
cl Naksu
balance: nukeop uplinks now have 5 unlimited discounts and 10 limited discounts shared between the team, rather than 3 individual discounts like traitor uplinks
/cl
* protocol crab 17: phase 2
* k
* meme
* fix
* k
* fixes
* more stuff
* makes qust's code not bad
* fixes time
* MFW (my face when) face when floyd doesnt make the fix commit
* makes it leave properly
* fixes more shit
* gets rid of stupid variable
* asdf
* wa la
* wa la ^2
* tadaa
* adds
* i fixed some of them but what do the others mean
* untested and ready to merge
Nukes the hybrid taser from orbit. Everywhere that spawned it now provides a disabler instead. Standard sec issue? Disabler. Armory? Disabler rack.
Want something with more punch? Beg the warden for a shotgun or an energy gun.
The hybrid taser itself has not been removed from the codebase.
Also removes the stun from the advanced energy gun so it doesn't just become the late game secret powerhouse.
Hoslaser keeps it, but only gets three shots instead of five.
The ebow has been COMPLETELY RUINED as well. See the changelog for details I'm too lazy to copypaste.
Why It's Good For The Game
Fuck stun based combat.
Sec still have their stunbatons, collapsible batons still exist, pepperspray still exists, flashbangs still exist. but now any fight involving sec or anyone who has robusted a sec officer will be less ranged instastun bullshittery.
Changelog
cl
balance: New NT regulations have replaced the standard issue hybrid taser with a pure disabler.
balance: Also fuck the stun mode on the advanced energy gun who thought that was a good idea.
balance: The hos's laser can only fire three taser shots instead of five.
balance: Energy crossbows have been reworked. They no longer paralyze, but instead heavily blur vision, apply a huge burst of stamina damage, and knock you on your ass for one second. Two shots is enough to down someone from stamina crit on both the mini and large versions. The blur lasts for 10 seconds.
balance: The price of the mini ebow has been reduced to 10TC to compensate for this weaker effect.
tweak: The ED-209 is now built with a DRAGnet and fires netshot instead of taser bolts.
balance: Stunshells can no longer be produced in any lathe.
balance: The "pacifier" mech taser can no longer be built.
/cl
* fixes rocket launcher, but not some other issues with it
* oh god oh fuck I broke everything
* ok nevermind we rollin
* remove a dumb testing runtime
* less weird gramma on new description
* change the typepath of the rocket to make it easier to know what it is
* I don't remember if I even changed anything here but here it is anyways
* grammar error fix
* better qdel
* casing to fix the article system
* grammar fixes + hack to clear the mag
* small hack for single round mags and makes sure icons update after being loaded
* whoops
* minimize diffs
* capitalization with improper flag
* Update uplink_items.dm
* update item names
* does all that stuff
* whoop forgot a comma
* adds geladi and cryo to mutation injector list
* adds mr freeze, i think
* maybe this will work?
* defines geladikinesis and cryo
* possibly fixes what was wrong
* ohhhhhhhhhhhhhhhhhh im an idiot
* one last thing
* mr freeze gets temp gun
* 20 TC
* Update uplink_kits.dm
* maybe?
* name change
* Update uplink_items.dm
* temp gun didn't have a firing pin
cl actioninja\memager
refactor: Ballistic guns have been almost entirely reworked from a backend side. This primarily focused on moving as much as possible into the base ballistic gun and turning as many other guns into essentially varedits as possible.
add: Guns can now be racked. This is the default action unless the magazine is empty.
add: Guns now can have the magazine removed by clicking on them with an open hand while they are in hand.
tweak: Suppressors are now removed by alt clicking instead of clicking with an open hand
add: Guns now have various bolt types that all function a bit differently. Open bolts cannot have a bullet chambered with no mag, locking bolts lock back after running out of ammo, etc.
add: All ballistic gun sounds are controlled by variables instead of hardcoded usages.
tweak: The l6 LMG has a reworked control scheme. alt + click to open and close the cover, open hand to remove mag, place mag in by slapping them together, default action is rack.
tweak: Functionality that used to be snowflake code such as tactical reloads has been moved to the base gun, and can be toggled by variables.
refactor: All shotguns are now properly subpaths of the shotgun type. They still work the same.
imagedel: Gun sprites have been almost entirely overhauled to use overlays instead of states. This collapsed the L6 sprite from 20 sprites to 9 sprites to give an example.
soundadd: Remixed versions of the shotgun and base gun firesound
soundadd: New rifle firesound for l6 and moist nugget, new SMG fire sound, new sniper fire sound.
soundadd: Lots of new weapon operation sounds such as racking and bolts and the like.
imageadd: New sprites for the Riot Shotgun, Combat Shotgun, c20r, Deagle, m90, double barrel shotgun and 1911 by Memager.
imageadd: All gun sprites that were pointing to the left have been flipped to point to the right.
balance: Shotguns now can be pumped faster.
balance: Bulldog can now be tac reloaded
balance: Sawn off shotguns now have an accuracy penalty and recoil
/cl
* toolbox pls
* rstar
* Update uplink_items.dm
* contents, force
* i
* toolbox now costs 2 tc
robuster
* "toolbox"
* grammar mistake
* bust < bash
* description is better
A old, blue toolbox, it looks robust.
* changed bash skulls to bust heads
because i just watched the space station 13 video again
* yuh
* asdf
* throw!
* uplink now notes that it increases in damage
* Combatgovesplus 1
* Combatglovesplus 2
* Combatglovesplus 3
* Combatglovesplus 4
* Combatglovesplus 5
* Combatglovesplus 6
* i have good england grammar I swaer
* fixed a slight english fucky wucky
* Allright done coiax
* I am probably retarded coiax not gonna lie
* you got me convinced GuyonBroadway
* Removes smugglers satchels
I love the cutie reading this
* remove smuggler's satchel from code
* removes all smugglers' satchel persistence code
* removes remaining things
storage component for smugglers, the miracle ruin (uses smugglers), the dme
cl coiax
add: Uplink pens now require two seperate rotations to unlock. This also
applies to failsafe codes.
/cl
With only 359 combinations on an uplink pen, it's crackable given a
small amount of time. With two, it's now 92,981 combinations, which
is more secure than PDA uplink codes (899 * 26 = 23,374).
cl Skoglol
tweak: Reorganized the syndicate uplinks. Items are now mostly alphabetical, some misplaced items moved to more fitting categories.
tweak: Added a new category to the uplink: Grenades and Explosives.
/cl
This hopefully makes finding the items you are after a bit less difficult. There were some category inconsistencies, and bombs/grenades were all over the place. This alphabetizes most of the uplink, except in cases where not doing so makes more sense.
The full list: https://pastebin.com/DdnN7npu
Things I weren't quite sure about:
Holoparasite category - kept it in dangerous weapons.
Energy shield category - Moved it to dangerous, next to energy swords.
tweak: Suppressed and dry fire sounds are now stored as a variable, and can be edited on a per gun basis.
sounddel: The standard gun dry fire sound was collapsed to one sound instead of 4. They were all just pitch variations anyways, which is now covered by built in sound pitch variation.
soundadd: Revolvers now have a unique gunshot sound that is slightly different for 357 and 38.
soundadd: Revolvers now have a unique dry fire sound.
soundadd: Revolvers now make a unique noise when emptying them besides just the sound of shells falling out.
soundadd: Spinning a revolver such as the Russian Revolver now makes a sound.
spellcheck: Syndicate sniper kit now includes a suppressor instead of a "supressor."
cl XDTM
add: Added the Hypnotic Flash to the uplink for 7 TC.
add: The Hypnotic Flash temporarily confuses and pacifies those it's used on.
add: If the victim is in a mentally vulnerable state (hallucinating, insane, reduced mental activity) they will instead fall into a trance, and will be hypnotized by the next words they hear.
/cl
Controlled hypnosis for traitors. Usual caveats apply: Mindshield prevents the trance effect (but not the confusion/pacification) and it can still deconvert from hypnosis; a new hypnosis will override the previous one; and most importantly for any ambiguity the interpretation is mostly up to the victim, so it's not a 100% sure conversion (i'm hoping people won't use this clause to just ignore it).
cl Skoglol
code: Added missing typepaths for syndicate implanters.
tweak: Stealth implant now comes in a box.
spellcheck: Changed the names of some syndicate boxes.
/cl
Some implanters were specific typepaths, others were basic implanters that had implants put in when the box was created. This makes them all behave the same. I considered removing the boxes for the implants as they aren't strictly needed to hold one thing, but I know some people like using boxes in their atmosphere and inventory management sim so I left them in.
Otherwise, specifying that a box contains something that is boxed was silly so I changed that. Except for the space suit, because that feels right.
And of course the stealth implant gotta come in a box.
* Add files via upload
* oops
* Species restriction attempt #1
* species restriction test
hope this goes well
* first one didn't work (who'dathunkit)
* Add files via upload
* Add files via upload
* Update code/datums/components/uplink.dm
Co-Authored-By: CRTXBacon <34610106+CRTXBacon@users.noreply.github.com>
* Update code/datums/components/uplink.dm
Co-Authored-By: CRTXBacon <34610106+CRTXBacon@users.noreply.github.com>
* Update flashlight.dm
* Add files via upload
* L A M P
* Update uplink_items.dm
* why the hell did it add two paragraph ends
* Update code/modules/uplink/uplink_items.dm
Co-Authored-By: CRTXBacon <34610106+CRTXBacon@users.noreply.github.com>
* Update uplink.dm
* Update code/modules/uplink/uplink_items.dm
Co-Authored-By: CRTXBacon <34610106+CRTXBacon@users.noreply.github.com>
* Update uplink_items.dm
* Update uplink_items.dm
This provides roboticists with an item that broadens their play style by
introducing a stealth element.
The concealed weapon bay is an item that attaches to Ripleys or Odysseuses and
allows them to equip one mecha weapon. A mecha can only have one attached.
Examining the mecha will not reveal the attached weapon (although the raising
message still shows). They cost 3 TC because they don't allow roboticists to
make mechas much more dangerous than the ones they can already make and because
roboticists will still need to have researched the weaponry to attach to the
mechas.
I made the sprite all by myself.
cl ShizCalev
tweak: Paper airplanes can now have their hit probability adjusted by badmins.
add: Added syndicate paper airplanes. They are rather robust and are guaranteed to hit someone in the eye.
add: Added The Art of Origami to the syndicate uplink. This allows you to fold weapons grade paper airplanes. It will also allow you to catch paper airplanes when you have the ability enabled.
/cl
