Commit Graph

419 Commits

Author SHA1 Message Date
00ze-cyclone
93822a0d09 Syndie surgery bag buff (not that much but still) (#13431)
* 2TC now

cheaper surgery duffel

* an implant case for the syndie surgery bag

* update description

so now people know that it got some more stuff
2022-03-19 13:40:26 +00:00
nmajask
fc5b71cf84 Pacifists that order stechkins from an uplink get a version loaded with soporific rounds (#13404)
* Pacifist stechkin

Gives pacifists who order stechkins from uplinks get a version loaded with soporific rounds.

* Alerts the user

Alerts the user of the change of ammunition

* Merge branch 'sleepy-round-stuff' of https://github.com/nmajask/Yogstation-But-Worse into sleepy-round-stuff

* Reworks the implementation

Makes starting mag a variable and changes the check to look for pacifism being a quirk.

* Update code/modules/uplink/uplink_items.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-03-13 17:45:52 -05:00
nmajask
314aa5fe59 Ports "Environment Protection Bags + Minor Weather Changes" and others (#13144)
* Ports the bodybag changes

Many changes

* Fixes the thing

Fixes the random change and gives the mining medic locker an environmental protection bag

* Fixed syndicate bags leaking gasses

This seems like a sloppy fix, but it works I guess
2022-02-10 18:21:41 +00:00
Byemoh
9f942b0aa7 Adds lesser sentience potion as an uplink item (traitor) (#12966)
* ow

* 7 tc and only one

* Update uplink_items.dm

* Update uplink_items.dm
2022-02-02 22:07:28 +00:00
ChesterTheCheesy
4d369ae1db Eldritch horror - the final PR (#13033)
* Update is_helpers.dm

* Update role_preferences.dm

* Update traits.dm

* Update names.dm

* Update traumas.dm

* Update miscellaneous.dm

* Update scanners.dm

* Update sql_ban_system.dm

* Add files via upload

* Update headcrab.dm

* Update panacea.dm

* Create e

* Delete e

* adds horror

* Add files via upload

* Update suicide.dm

* Add files via upload

* Update brain_item.dm

* Update death.dm

* Update human.dm

* Update transform_procs.dm

* Update gun.dm

* Update organ_manipulation.dm

* Update uplink_items.dm

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Create horror.txt

* Add files via upload

* Update yogstation.dme

* adds horror-relatated tips

* fixes a typo

* Update code/_onclick/hud/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update scanners.dm

* Update code/modules/antagonists/changeling/powers/headcrab.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* i hope this won't break again

* actually makes horror unable to force lings to suicide

* fixes duplicate definition

* Not needed, changeling code already checks for that

* Cleans up a lot of code

* thank you theos for absolutely nerfing the crap out of horror tentacle

* cleans up a lot of bibby's suggestions and fixes a few bugs

* not sure if i changed anything in this file, but fuck it

* lets fix that merge conflict

* i sure hope github doesn't go nuclear

* oops made horror unable to work

* i hate logic gates

* sorry for commit spam but this thing literally broke horror and i wanna fix it as soon as possibles

* HAHA STUPID DE MORGAN! (tested works as intended)

* abominations summoned by curator horn should not attack horror anymore

* adds missing "

* cannot use lube ability whilst dead anymore

* Update horror_abilities_and_upgrades.dm

* flailing lube stops when you're killed while doing it

* fixes ordering so you can't get stuck in wrong animation at the last spin

* Horror can no longer squeeze through welded airlocks

* Infesting people is now assigned to Alt+Click

* makes tentacle arm no longer affected by range multipliers

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-02-02 18:44:08 +00:00
LazennG
460081ad2c New Traitor Item: Air Shoes (#13153)
* New tator item: Air Shoes

New 'air shoes'
-intended tot item for 4-5tc
-functionally wheelys that can ollie as well
-slight maneuverability in 0g just like moths

Co-Authored-By: Byemoh <5091394+ToasterBiome@users.noreply.github.com>

* things changed

-tried giving them the ability to ollie but botched it and idk how
-nvm baiomu told me

* Update scooter.dm

sparks appear on activation of shoes

* making it so if atmos is ok and gravity is gone yo can still move

* LAST THING DIDNT WORK

trying tje walk in pressurized thing again

* what do you MEAN UNDEFINED VAR

* stole from mothcode again instead

fuckin indentationerrors

* Update miscellaneous.dm

* fuck it dealing with this part later

* SPRITES BABEY

airshoes have proper worn/item sprites now

* changing shoe toggle sprites

toggling them on has its own sprite, but working on getting the ollie one to work properly

* Update shoes.dmi

* another shot at the movement in 0g

second attempt at allowing movement in 0g and atmos

* headache part 4

* Update miscellaneous.dm

* messed up vehicle sprites

added in icons for riding but sprites are a bit buggy atm, will replace later when replacements come in

* trying to figure out why a button wont change

* got it

no longer skateboard ollie

* just had a worse idea

gonna replace noslip with something else

* yes its dashing

* jorts

* jorts 2

* vehicle sprite

* last sprite thing

added custom sprite for shoe dash

* shoes can be renamed now

* Update miscellaneous.dm

* other actions now available+fixed sprite mistake

-removed a redundant line stopping the action from being recognized
-removed old shoe vehicle sprites so there's no shoes on top of shoes

* adds shoes to uplink and changes dash name

-alphabetically added to misc gadgets section
-name of dash changed from 'activate air shoes' so its less confusing

* Update miscellaneous.dm

* fixed a problem

walking while dashing used to just interrupt the dash so i just made the dash happen faster

Co-authored-by: Byemoh <5091394+ToasterBiome@users.noreply.github.com>
Co-authored-by: ToasterBiome <baiomurang@gmail.com>
2022-01-26 19:02:54 +00:00
KillerOrcaCora
bc9459a677 Update uplink_items.dm (#13108) 2022-01-16 07:09:31 -05:00
Lucy
0e05d7ff77 Lowers cost of Crew Manifest Spoof to 4 TC (#13064) 2022-01-12 17:50:40 +00:00
Lucy
4d1ce8c9ba Adds the Access Kit for infiltrators (#12850)
* Adds the Access Kit

* This is what I get for letting Copilot write DM

* Update yogstation/code/modules/antagonists/infiltrator/items/access_kit.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

Co-authored-by: Hopekz <hopekxx@gmail.com>
2021-12-19 13:22:26 +00:00
Lucy
acdd30ae92 Excludes the hacked AI law upload module from infiltrators (#12846) 2021-12-11 16:25:32 +00:00
Theos
2a41d505f6 does the thing bee did and amkes the brainwash disk have no job restrictions (#12778) 2021-12-11 16:10:33 +00:00
Lucy
dcab94dbc0 Stand-o-rama - rebalances a bunch of holoparasite stuff (#12774)
* Stand-o-rama!

* Fix ESLint stuff

* Dust on death.

* minor code tweaks

* Fix spans

* use defines to make bibby happy

* whatever there'll only be one anyways
2021-12-09 19:43:08 +00:00
Lucy
84ff9c6d50 Infiltration game mode (#12270)
* Infiltrators!

* Fix the cigarette vending machine in the infiltrator base

* Uncomment role preference

* Fix a bunch of bugs.

* Changes to AI hijack

* GODDAMIT I FORGOT TO SAVE IN STRONGDMM

* Fix the dumb gravgen runtime.

* Just throw the infiltrator base on centcom directly

* Add infiltrators to one-click antag (and fix vampires not being in it)

* blame jamie

* add infiltrators event

* Admin only for now.

Admin only for now.

* Maybe fix the round ending a BIT too early?

* Fix uplink not appearing properly in the roundend report

* Improve examine text for infiltrator power sink

* Whoops, remove the J

* More stuff.

* Jamie's map changes

* Make the AI hijacker more idiot-proof.

* Update map again.

* fix infiltrators not being able to use edaggers

* Update centcomm map again

* aaaaa

* fix powersink examine

* e

* wait nvm that's right

* big typo whoopsie

* Some big ol' improvements!

* some tweaks to infiltrator uplink items

* Use span defines, some hijacked AI stuff...

* infiltration implants! woohoo!

* fix pinpointer to objectives not working

* dammit actually fix the pinpointer

* New pinpointer sprite!

* new sprites!

* Finishing all objectives no longer finishes the round.

* Fix sprite

* fixy fixy

* you can now put TC into your uplink

* restrict holoparas for infiltrators

* Fix infiltration implant creating a bugged implant case

* Fix CTF; add another infiltrator item spawnpoint

* tweak shuttle a bit

* you can no longer hijack dead AIs; 3rd item spawnpoint is now on the shuttle

* prevent using PDAs to metagame

* no removing purrbation

* hijacked ais can no longer doomsday; infiltrator objectives now properly respect quiet round

* make kidnap code slightly better

* show to ghosts

* remove cornered donuts in infiltrator ship

* fix up objective code stuff

* fix telecrystal thing still not working

* Add to config

* add minimum age of 3 weeks; add dynamic ruleset copy-pasted from nukies

* nvm i'm too lazy to figure out how this works

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-12-04 17:42:36 -05:00
Theos
5773210a4e reduce armor polish cost from 6 to 2 (#12723) 2021-11-25 07:26:25 -05:00
KillerOrcaCora
fe7650f304 Osprey description update! (#12335)
* Update uplink_items.dm

* Update minigun.dm

* Update uplink_items.dm

* Update uplink_items.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-10-24 15:04:17 +01:00
Theos
0c4f4547f5 Adds sleepy rounds for the 10mm pistol, this is totally not going to be either blatantly over or underpowered lmao (#12368) 2021-09-28 03:30:45 -04:00
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
azzzertyy
f78dea8249 Adds Syndicate Stamp (#12258)
* adds syndie stamp

* final

* adds stamp to nuke base

* adds it to more maps

* fixes sprite

* edited sprite

* Adds to uplink

* bad name fixed

* makes syndie & chameleon stamps turn boxs into syndicate boxes
2021-09-07 22:36:06 +01:00
enkidienne
588f603306 Mantis blade (new traitor item) (NOW with fixed conflicts) (#11946)
* try 1

trying to fix

* grammar 1

* Update augments_arms.dm
2021-08-24 09:09:32 +01:00
ynot01
2ee7bcdd37 revert ebow nerf (#12035) 2021-08-16 11:48:33 -04:00
ynot01
72297f5bf1 Adds chameleon chest rig (#11899)
* makes chest rig not useless

* removes useless code
2021-08-14 13:17:59 +01:00
nmajask
1434e4e3c2 Gives Mining Medics job specific traitor items (#11528)
* Add files via upload

* changed sigtech, tourist, and clerk icons

added more detail to sigtech icon
new tourist and clerk icons

* Some more icon changes

I uploaded the wrong file

* applied grimm-hollowknight requested changes

Adds new signal technician and paramedic hud icons and reverts clerk's back, all requested by grimm-hollowknight

* ah, so thats why you reverted that change

im dumb

* why cant i merge upstream

why github

* Gives mining medic job specific traitor items

Gives mining medic tators access to the Kinetic Accelerator Pressure Mod, Brainwashing Surgery Program, and Arm Mounted Medical Beamgun

* Comments and Paramedic Medigun

Added comments to the changed TG code
Gave Paramedic access to the Arm Mounted Medical Beamgun

* Adds polymorph tator items

Man, this pull is never going to be reviewed
Gives Polymorphs a traitor item, a box with some xeno organs
There is another item commented out that is a kit containing stuff to start a xeno infestation, if requested I can remove or uncomment it

* Added stuff for the polymorph tator items

Just added two kits, with one commented out

* Added stuff for some polymorph tator items

Two auto surgeons were added, one was commented out.

* Should fix the polymorph traitor items

think it was an accidental indent
2021-06-19 16:11:38 +01:00
Byemoh
e18ea41547 New Stealth Traitor Item: Armor Polish (#11427)
* armor polish, made it a traitor item

* decapitalization

* ok im moron

* added hats

* fixes icon

* better icon

* Update code/modules/uplink/uplink_items.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/game/objects/items/armor_polish.dm

readability + strictly less than

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/game/objects/items/armor_polish.dm

[src] magic

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/game/objects/items/armor_polish.dm

plural

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/game/objects/items/armor_polish.dm

headgear

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/game/objects/items/armor_polish.dm

plural

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* plural fix

wasn't this already fixed

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* strictly less than

* changes it to suits and headgear

Co-authored-by: Hopekz <hopekxx@gmail.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2021-05-17 15:15:35 -04:00
Theos
efde068bf0 Add lizard martial art (#11206)
* kill

* need to update these

* Update flying_fang.dm

* Update granters.dm

* i want die

* caps

* forgot that

* sprites

* new sprites and the learny thing can be used to beat people

* Update uplink_items.dm

* Update uplink_items.dm

* l

* add icon and stun weapon restriction

* Update uplink_items.dm

* updated icon
2021-04-03 18:55:52 +01:00
swissloaf
2dcfa48332 Adds a syndicate EMP bomb (#11217)
* w

* Update syndicatebomb.dm
2021-03-29 20:27:51 -04:00
ynot01
0f3f1e5f26 Ubercharge (#10875)
* IM FULLY CHARGED

* why is this caps locked

* indentation

* needs to call parent apparently?

* Update code/modules/projectiles/guns/misc/medbeam.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update medbeam.dm

* Update medbeam.dm

* delta time & action fix?

* typo

* buggy spelling

* appropriate removal of godmode

* .status_flags

* bit operators

* ~

* uber overlay

* funnier desc

* shitcode indicator

* poke

* Update medbeam.dm

* )

* not shitcode

Co-Authored-By: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* caps

* round

* name fluff

* uplink

* advertisement

* prevent uber flashing

* patch exploit

* turn off if uber flash

* comments and autodocs maybe

* no uber flashing to save uber

* fix flash detection

* clean up

* stolen from timestop

* 40-80 seconds for uber charge

* push

* unpush

* poke merge conflict

* godmode tell

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2021-02-13 16:18:07 +00:00
ynot01
65840b190a Uplink items rebalancing (#10827)
* Update uplink_items.dm

* Update uplink_items.dm

* Update uplink_items.dm
2021-01-30 11:12:06 +00:00
ynot01
77b5b2b35e carp throwmode flavor text (#10777) 2021-01-05 12:14:26 +00:00
Hopekz
23c04a0815 Removes Syndicate meta from the game (#8144)
* Removes traitor meta from the game

* Removes unused define from previous tests

* Update flashlight.dm

* clock cultists can now use chameleon clothing

Doesn't let everyone use them.

* fixed broken merge conflict resolve
2020-12-31 11:23:44 +00:00
Katie
2fad6f0884 sleepy pen desc (#10442) 2020-11-18 15:20:43 -05:00
Nichlas Pihl
6e66e64e38 Corporations II: Adds corporate discounts to the traitor uplink (#10197)
* Adds corporate discounts to the traitor uplink

* Actually adds the manufacturing
2020-11-01 19:13:57 +00:00
AdamElTablawy
b8d18d3682 buzzkill tc drop (#10068) 2020-10-20 16:57:13 -04:00
Takahiru
2038e0f7a1 SKILLCAPES (#9818)
* Skillcapes

* imagine accidentally removing a proc

* what

* centcom

* What gamer wants, makes admin/mentor/ghost skillcapes autodrobe only.

* Antag cape added to uplink

* What gamer actually wants

* Update global_lists.dm

* Update preferences.dm

* Update code/modules/client/preferences.dm

count++

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* nichchange 2

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-14 11:55:02 +01:00
ynot01
a1b93a3219 Sleeping Carp Rebalance (#9607)
* Sleeping Carp rebalance

* fix
2020-10-08 11:02:46 +01:00
Theos
c985bea6a1 Reworks CQC to have less stuns and adds it to the traitor uplink (#9394)
* Update cqc.dm

* Update cqc.dm

* hate variable names

* check_block returns the martial art used to block

* handle_block using martial arts, begin allowing nonlethal martial arts

* add handle_counter to spec_attacked_by

* add handle_counter to classic baton

* add handle_counter to stunbaton

* delete obsolete check_martial_counter proc

* add nonlethal var and handle_counter base proc to martial arts

* Update cqc.dm

* Update species.dm

* local fixes

* move several things to make them work better and fix pacifism handling

* remove cqc uplink lock

* f

* help

* Update martial.dm

* Update cqc.dm

* Update cqc.dm

* Update cqc.dm

* Update martial.dm

* help i still dont know what to do with pressure

* Update code/datums/martial/cqc.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update species.dm

* makes grabbedby actually return stuff

* makes cqc grab only stun on successful grabs and makes CQC pressure disable limbs

* leg sweep knockdown halved

* Update cqc.dm

* Update cqc.dm

* update description

* actually update description and makes restrain not jank as hell

* add attack animations to basically everything and changes the slam attack's sound to actually play on time

* adds a mute to the kick attack

* increases slam damage from 10 to 20 and increases the slam knockdown from 60 to 80 deciseconds so it's unique from harm intent while prone

* updates slam info it's actually 15 stamina damage up from 10 20 paralyze up from 10 or 15 or whatever and 80 knockdown up from 60

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2020-10-06 09:35:58 +01:00
boodaliboo
3bb35a2adc (port) feral cat grenade (#9615)
* Create feral_cat.dm

* Update spawnergrenade.dm

* Update uplink_items.dm

* Update yogstation.dme

* Update spawnergrenade.dm

* Update uplink_items.dm

* Apply suggestions from code review

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2020-09-14 19:46:54 +01:00
jcatjmeow
a2da4be095 Reduces the TC cost of the Syndicate Reverse card from 6 to 1 (#9610)
* Create construction_drone.dmi

* Delete construction_drone.dmi

* Add files via upload

* Delete RCD Drone.dmi

* Add files via upload

* Update aux_base_camera.dm

* Update aux_base_camera.dm

* Update aux_base_camera.dm

* Update uplink_items.dm
2020-09-14 19:37:44 +01:00
AutisticFroggy
0c3b5c5b51 [READY] Adds the Supermatter Delaminator (#9037)
* BRRRRRRRR

SM GO BRRRRRR WHEN EMAG

* SM now screams over comms that it is emagged and nerfs the EMPs so it doesn't instakill every preternis on the z level regardless of where they are

Thematic fluff added, gonna write lore bits around that later. EMPs nerfed and also line spacing fixed.

* Removed loophole around the emag to prevent powergaming

* Final balance chages and bugfixes

EMP now only pulses 5 times to avoid killing AI outright while still dealing massive havoc to the station.

Explosion in space is now as strong as intended to prevent the easy and braindead solution of spacing the crystal.

Fixed chat spam.

* Fixes some shit I missed

Damage now capped to hardcap, hallucinations logic merged and capped.

* Hopefully should fix lints, adds more flavor text

see title

* Fixes lints caused by adding flavor text

* Core functionality update

Basic core functionality added. Moved from emag to new supermatter delaminator traitor item. Some bugs still there but generally workable. Next commit should be the one that fixes them.

* Update supermatter.dm

* updates corruptor sprite

:codersprites:

* Final changes

SM no longer goes BRRRR as it is too LRP. SM now sets itself on fire at the right temperature.

* Fixed one comment that had the wrong text

* Adresses Alexkar's concerns. Also adds logging to the original thing I copied from.

- Adds logging for when someone commits dual suicide with someone else using a loaded set of tongs. Also sends an admin message since this behaviour is griefy if done on purpose. Applies to both supermatter_delaminator.dm and theft_tools.dm
- Removes ismob(loc) from theft_tools.dm where I copied the code from.

* Updated logging per HC request

* logging update 2 electric boogaloo

* loc bad 3 shitcode removal reeeeeeeeee

* cleanup

* Wow! This bug has been here for years!

Remember kids, argument order is important!

* when both constants are the same so you replace the wrong one

big pepega moment

Co-authored-by: mix <mgadevera@gmail.com>
Co-authored-by: Unknown <therarpar@gmail.com>
2020-07-30 16:28:27 -04:00
boodaliboo
530e2b7793 Update uplink_items.dm (#9293) 2020-07-25 16:11:55 +01:00
swissloaf
a8489f77b6 Ultra badass syndicate fedora (#9049)
* Add

* update

* asd

* Update jobs.dm

* New Hats

* Update jobs.dm

* Hats
2020-06-30 21:06:55 -04:00
Jumps
a5c41c75a5 L6 Saw Price increase (18TC --> 20TC) (#8890)
* initial

* double linked lists

* Revert "double linked lists"

This reverts commit 54ea3cb3e3.
2020-06-29 21:20:57 +01:00
jcatjmeow
78dee8cbac Fixes $2895 (#9039) 2020-06-26 22:54:54 +01:00
jcatjmeow
56984637aa Creates the SyndieReverseCard (#8875)
* Creates the SyndieReverseCard

* Jamie makes me cry

* thanks kar kar <3

* Update syndicateReverseCard.dm

* Apply suggestions from code review

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

* Update syndicateReverseCard.dm

* Makes it super obvious this is a big evil item AFTER it's been used

* Update items_and_weapons.dmi

* makes the overlay sprite a bit better

* Update syndicateReverseCard.dm

* Update code/game/objects/items/syndicateReverseCard.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

* Update syndicateReverseCard.dm

* isCarbon, jamie suggestion

* c

* Merge conflict: resolved

* kar kar

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2020-06-22 00:01:03 +01:00
Xoxeyos
0928d8ed95 Ports Dynamic Gamemode Code from Beestation. (#8390)
* Adds support for dynamic mathing

* Adds Dynamic Main Files.

* Adds Dynamic loading to yogstation.dme

* Probably adds dynamic related changes.

* Fixes code I didn't add, won't fix my retardation.

* Adds "/datum/game_mode/proc/admin_panel()" because it's apparently important.

* Adds dynamic related code.

* Adds more dynamic related code.

* Fixes error: possible unreachable code here on line 313

* Fixes copy and paste error. 


code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm, line 390, column 2:
error: possible unreachable code here

* Adds a testing change to fix the lint

* Undos paranthesis

* LintFixTry#2

* Adds Shadowling

* adds a slash

* adds some logging

* Adds IMMERSION

Thank you Theos for the help!

* FIXES     IMMERSION

* Adds Mindshield Implants for Dynamic

* Adds the mindshield implant into dynamic

* Adds the mindshield stuff yadayadayda

* adds another slash

* removes said slash

* test addes imp_ before mindshield on line 427

* redo

* test

* Going to try and do this again #1

* syndie_kit/mindshield/

* gets rid of an error

* renames to imp_mindshield

* Maybe I'm just super retarded.

* v

* #include "code\game\objects\items\implants\implant_mindshieldtot.dm"

DOES THIS FIX IT DOES THIS FIX IT

* oops

* recompile

* Part of getting rid of weights, relies on dice rolls

* Adds dice roll, adds the ability for clock cult to roll

* Readjusts weight and costs, no more weight

* ahem fuck you travis or whatever the hell your name is - recompile

* Oh god oh fuck clock cult cost 0 for a while, oh god oh fuck meteors are now in, only coming in at threat 100 and higher. Shadowling requirement shifted,

* recompile

* Rev Fix

* Allows more midrounds to play

* Clockwork additions and whatnot

* Adds Vampire, and some changes to the requirements, and whatnot.

* Fixed Jobs to Roles

* Adds Vampire to Late Join

* Adds vampire cooldown to roundstart

* Adds Traitor_Ruleset to Vampire

* Adds Vamps to midround

* recompile

* Shadowling Modification

* Revs are now under the flag TRAITOR_RULESET, shadowling change, attempts to keep the round from ending if all the shadowlings die.

* Makes mindshield limited stock, now costs 1 tc, very small chance to show up in surplus crate, isn't illegal tech, player mininum is 30

* Adds cargo crate discounts

Thank you Jamie and Gamer for helping!

* Adds the party crate to discount

* Adds Zombies to the midround

* Recompile

* FUCK YOU RECOMPILE ALREADY

* recompile

* Jungle Fever can now roll.

* Only need one vampire candidate now.

* Fix

* Ah shit it seems you're utterly fucked.

* Update dynamic_rulesets_roundstart.dm

If set to TRUE, dynamic mode will be able to draft this ruleset again later on. (doesn't apply for roundstart rules(?))

* No Highpop req for shadowling

* Adds Darkspawn

* Adds some logging.

Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: fluffe9911 <dablank02@hotmail.com>
2020-06-14 17:34:17 +01:00
Jumps
cca6387499 ports Researchable Smartmines + Exploding Rubber Duck traitor item from Beestation (#8437)
* initial

* removes soundsynth

might add this back later i'm not too sure about it atm

* reduces disarm time

* bro pls

* Revert "bro pls"

This reverts commit a0a319dd0e.

* changes for alexkar

* changes2

* turdis why

* spacing

* desc change

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2020-05-29 15:15:23 -04:00
Darkstick
f8cf315cbf This time it will work (#8645) 2020-05-24 17:49:56 -04:00
Katie
90ab0d7778 removes some empty lines (#8603) 2020-05-20 22:49:13 -05:00
alexkar598
316d998048 Indent fixes (#8489)
Co-authored-by: alexkar598 <>
2020-05-12 19:32:42 -04:00
Takahiru
4f6988ab79 Adds hierophant antenna traitor item 2020-04-17 15:26:07 -04:00
Ktlwjec1
ace201533c makeshift weapons 2020-02-19 05:00:53 +00:00