Commit Graph

318 Commits

Author SHA1 Message Date
Emmett Gaines c3f95024b2 Gets rid of the GetComponent macros (#44220)
* Removes the GetComponent macros

* Regex replacement for GET_COMPONENT

Search: `GET_COMPONENT\( *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = GetComponent($2)`

* Regex replacement for GET_COMPONENT_FROM

Search: `GET_COMPONENT_FROM\( *(.+?) *, *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = $3.GetComponent($2)`
2019-06-04 17:39:58 +02:00
wesoda25 6057c768af Crab Protocol Now has Limited Stock (#44063)
* aaaaa
2019-05-22 14:34:03 +02:00
vuonojenmustaturska 300e663f32 Nukies get two kinds of shared team discounts rather than individual discounts (#44027 )
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
2019-05-22 10:48:32 +12:00
zeroisthebiggay a6cf54605b nukies get rigs too (#43824) 2019-05-08 14:11:52 -04:00
Qustinnus 954ea6d33f fuck (#43854) 2019-05-07 19:09:58 -04:00
Qustinnus fc2966ff01 [READY] Execute Protocol Crab-17: Phase 3 - The one where Floyd actually finishes the PR (#43338)
* 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
2019-05-05 19:40:46 -04:00
Rob Bailey ee33e9c6a8 [READY] The war on stun based combat, Phase I: Fuck ranged stuns (#42930)
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
2019-03-08 10:30:50 +13:00
Tlaltecuhtli 36ed050fea uplink items rebalance (#42883)
* uplink items rebalance

* e
2019-02-27 15:53:52 -05:00
Rob Bailey 86cb5c2576 Fixes the RPG, renames it and adds some fluff text (#42853)
* 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
2019-02-25 21:48:11 +11:00
SouDescolado 8773c91ae7 Makes Syndiecash be restricted (#42763) 2019-02-16 17:33:19 +01:00
wesoda25 1cadfc9580 Branches Syndicate Bundle into A and B Categories, adds Mr Freeze Bundle (#42662)
* 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
2019-02-05 21:49:21 +11:00
Rob Bailey 69e217d8d9 [READY] I got guns (#41804)
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
2019-02-04 10:27:01 +13:00
pubby 2d37bde715 Drop "universal" from the suppressor name. (#42574)
It's incompatible with lots of guns so the name is misleading.
2019-01-29 23:34:15 -08:00
Denton eedc94f718 Fixes unavailable syndicate bundle 2019-01-20 09:35:48 +01:00
duckay 9cf3c5bbf8 Assistant Traitor Item: Part Electric Boogatwo (#42297)
* 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
2019-01-15 12:13:36 -05:00
Jordan Brown bf880ffde2 Merge pull request #42298 from coiax/spot-the-satchel
Fixes smuggler's satchels not being visible with t-ray
2019-01-15 09:27:08 -05:00
81Denton 35ebc44fab Rearranges uplink items (#42339)
* Rearranges uplink items

* arranges TC order
2019-01-14 17:23:01 -05:00
Jack Edge dd7dfb9594 2->1 2019-01-14 20:39:47 +00:00
Dangerous dingidy doo a229d0998f Adds Combat Gloves Plus for operatives at 5tc (#42250)
* 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
2019-01-07 11:49:32 -05:00
coiax ffd160a495 Readds non-persistent contraband filled smugglers satchels (#42228)
* Readds non-persistent contraband filled smugglers satchels

* Ten random satchels are placed each round
2019-01-07 21:16:47 +11:00
subject217 5a52f8a7bf Removes smugglers satchels (#42166)
* 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
2019-01-02 15:28:26 -05:00
coiax 755a9e4fb3 Uplink pens now need two separate rotations to unlock (#41843)
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).
2019-01-02 01:03:42 +13:00
skoglol f95270404e Reorganizes the uplink, adds grenades and explosives category. (#41834)
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.
2018-12-09 23:30:19 +13:00
Rob 6b8bfb2f5c [EXTRAREADY][AAAAAA] Hey revolver, don't mothers make good fathers? (#41620)
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."
2018-12-02 20:30:09 +13:00
XDTM e053faabd0 Adds the hypnotic flash to the uplink (#41604)
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).
2018-12-02 20:19:42 +13:00
skoglol 8983a37320 Some syndie implant cleanup (#41571)
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.
2018-12-02 20:10:05 +13:00
MrDoomBringer 2b83fef9ec big change (#41689) 2018-11-28 22:24:01 -05:00
CRTXBacon 0557320528 Adds race-restricted category to syndicate uplinks (#41340)
* 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
2018-11-18 17:47:45 -05:00
81Denton 0bfe0cc80f Improves Uplink descriptions + formatting (#41565)
* Improves Uplink descriptions + formatting

* ree

* linebreaks

* misc fixes
2018-11-18 10:26:09 -05:00
swindly 88ca87e9d9 Add concealed weapon bay (#41516)
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.
2018-11-17 10:53:12 -08:00
Denton ea4bfdebee Makes illegal tech node harder to unlock 2018-11-15 16:36:24 +01:00
ShizCalev 157de4243a Allows paper airplanes to be vareditted to always hit someone in the eye (#41328)
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
2018-11-12 20:49:32 +13:00
ShizCalev 8c88d6bde4 Rocket launcher fixes 2018-10-30 01:38:19 -04:00
Jordan Brown 6dc4ecf884 Merge pull request #41051 from Steelpoint/MagRename
Alters Sketchin Uplink Description
2018-10-22 14:55:54 -04:00
Steelpoint 47b8e1fb9a RenameDesc 2018-10-21 20:38:32 +08:00
fluffe9911 9ca2c50d2f Makes Romerol Buyable for Nuke Ops 2018-10-20 10:11:23 -04:00
bawhoppen 18db7e0cc9 Fixes l6 saw having ridiculous ammo caliber (#40908)
* Fixes ammo caliber

* Fixes reference L542
2018-10-15 08:59:13 -04:00
oranges 641e4304c8 Merge pull request #40575 from 81Denton/runtime-tweaks
Runtimestation: Uplinks, darkroom, ARCD/RLD
2018-10-03 10:07:11 +13:00
FrostyFridge a0b64fb383 Changed job restrictions for brainwashing disk (#40553)
cl Frosty Fridge
tweak: CMO and Roboticist traitors can now purchase the brainwashing surgery disk.
/cl

Previously, only Medical Doctors could purchase a brainwashing disk from their uplinks. The CMO and Roboticist roles both involve operating on patients. Both roles have access to an operating table with an attached operating computer in their workplaces. It makes sense to give them access to purchasing the brainwashing surgery disk from their uplink.
2018-10-03 10:04:40 +13:00
Denton 7b729a3dc4 Runtimestation: Uplinks, darkroom, ARCD/RLD 2018-09-28 23:07:08 +02:00
ShizCalev b1b56e6a5e Adds RPGs to Nuke Ops (#40372)
* Gives Syndies RPGs

* Makes the rocket reusable

* fixed minor sprite issue

* SRM Rocket renamed to HE rocket
2018-09-27 12:47:23 +03:00
81Denton b031ba7a04 Adds gorilla cubes to the uplink (#40468)
* Adds gorilla cubes to the uplink

* fixes floyd's spelling
2018-09-25 23:51:09 -06:00
AnturK 79192f9182 Bluh 2018-09-16 19:25:33 +02:00
AnturK 332c0a94b5 Memory store and that horrible argument name. 2018-09-16 19:25:06 +02:00
AnturK ece55c0064 Makes uplink show up in roundend log 2018-09-16 14:07:55 +02:00
AnturK 3084371f6d Failsafe uplink codes. 2018-09-16 13:35:43 +02:00
Jordan Brown d459d3ee81 Merge pull request #40263 from FantasticFwoosh/decoybgone
Removes fake nuclear disks from null-crates.
2018-09-14 11:34:34 -04:00
vuonojenmustaturska ab739294e1 Saboteur borg module (syndicate engiborg) (#40163)
* wip

* SPRITES

* wops typo

* make it available

* add borg chameleon module (wip)

* we ready boyes

* bump cost

* disable filter for now

* henk

* add to polymorph pool

* borgs don't generally throw their modules

* this too
2018-09-13 13:33:35 +02:00
FantasticFwoosh 65acddf202 Removes fake disk from nullcrates
*nullifies* the value for the station loving disk to appear in nullcrates contrary to the surplus crate
2018-09-13 10:09:38 +01:00
subject217 b3d1888bd6 Clown Car balance changes (#40222)
balance: The Clown Car can no longer move unrestricted in zero gravity environments.
balance: The Clown Car now costs 20 TC to purchase.

This PR was done at the request of @vuonojenmustaturska. I renamed entered.dm to sealed.dm because it's where the sealed subtype is defined and it's primarily used for procs specific to sealed. The balance changes were Naksu's idea. I definitely think not being able to move freely in space is a good change. I'm ambivalent about the TC, but the item felt like a gimmick that you should fully commit to like His Grace, and the free space movement + 4 TC space suit was a bit cancerous.
2018-09-13 10:23:13 +12:00