Commit Graph

86496 Commits

Author SHA1 Message Date
Gandalf d12adac635 CME changes (#7814)
* a

* a

* Why

* a

* a
2021-08-28 19:01:06 -04:00
SkyratBot afef6fbe81 Automatic changelog generation for PR #7838 [ci skip] 2021-08-29 00:54:26 +02:00
jjpark-kb 2b421fc26b okay, venus cant hit all the time now (#7838) 2021-08-28 23:54:24 +01:00
Pinta cced339210 adds in ovens (#7836) 2021-08-28 23:53:51 +01:00
Pinta 9b0fddb40d [Modular][QoL] Hyposprays now show the chemical color of the vial inside of them. (#7835)
* basis

* large vial sprites

* updates icon upon draining
2021-08-28 23:53:44 +01:00
SkyratBot 62fc0df975 Automatic changelog generation for PR #7834 [ci skip] 2021-08-29 00:53:35 +02:00
GoldenAlpharex 434adc11fd Fuck you *Destroy()'s your borer correctly* (#7834) 2021-08-28 23:53:32 +01:00
SkyratBot 98ab669734 Automatic changelog generation for PR #7831 [ci skip] 2021-08-29 00:52:59 +02:00
AxieTheAxolotl 020b987334 yuh (#7831) 2021-08-28 23:52:57 +01:00
SkyratBot 37f2bd349c Automatic changelog generation for PR #7829 [ci skip] 2021-08-29 00:51:49 +02:00
小月猫 cea054b5f9 fixes disposals nss (#7829) 2021-08-28 23:51:47 +01:00
SkyratBot 8aeafb437c Automatic changelog generation for PR #7828 [ci skip] 2021-08-29 00:51:41 +02:00
Pinta 2433b457ad Update _job.dm (#7828) 2021-08-28 23:51:38 +01:00
SkyratBot a41ee83677 Automatic changelog generation for PR #7824 [ci skip] 2021-08-29 00:51:30 +02:00
Pinta a4347c9157 [MODULAR] Gives ghost cafe a botanical chem dispenser and a oven. (#7824)
* Update CentCom_skyrat_z2.dmm

* oven time
2021-08-28 23:51:28 +01:00
SkyratBot e650848fdc Automatic changelog generation for PR #7832 [ci skip] 2021-08-28 16:00:38 +02:00
SkyratBot 68e9516597 [MIRROR] colossus-type projectiles no longer explode sealed vehicles (#7832)
* colossus-type projectiles no longer explode sealed vehicles (#61030)

* colossus-type projectiles no longer explode sealed vehicles

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
2021-08-28 10:00:36 -04:00
SkyratBot eab88597fc Automatic changelog generation for PR #7825 [ci skip] 2021-08-28 05:43:52 +02:00
GoldenAlpharex 8550b8c90c Fixes a CI hard del (#7825) 2021-08-28 04:43:50 +01:00
SkyratBot 5347a4ff8d Automatic changelog generation for PR #7823 [ci skip] 2021-08-28 05:25:55 +02:00
jjpark-kb ad6c9a42e8 makes t3 and t4 scythes purchaseable only (#7823) 2021-08-28 04:25:53 +01:00
ORCACommander d606a1a81f Duplicate entry removal (#7822)
not a clean rebase so now there were 2 entries for cyborgs.
2021-08-27 22:42:45 -04:00
SkyratBot 5e0fd1a36c Automatic changelog generation for PR #7734 [ci skip] 2021-08-28 03:55:39 +02: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
GoldenAlpharex f56c96c8ce [Kinda Mirror] Upgrading the GitHub Stale Action because of a missed mirror (#7821)
* Hahaha GitHub Bot you closed my PR

* https://github.com/tgstation/tgstation/pull/60989 [Mirror-ish]

* Okay less days, but we still gotta upgrade
2021-08-28 02:14:10 +01:00
SkyratBot ef0323ef0d Automatic changelog generation for PR #7701 [ci skip] 2021-08-28 03:13:01 +02:00
Tom f2f1d8beb2 Organic Interface Update Spelling and Grammar Cleanup, or: How I Learned To Hate Myself (#7701)
* Sex 2 Spelling and Grammar Cleanup, or: How I Learned To Hate Myself

* Fix

* C

* suggested changes

* *rolls up sleeves* Fine, I'll do it myself

* Oop-

* Update modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm

* Funny Regex time

* fix

* Unclosed tags, nice. And also newlines

* Oop

* 1 spaces, two spaces... my regex isn't that flexible please

* And I'm using old regex too

* Update modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_gloves.dm

Co-authored-by: Funce <funce.973@gmail.com>
2021-08-28 02:12:58 +01:00
SkyratBot 766b309b68 Automatic changelog generation for PR #7699 [ci skip] 2021-08-28 03:11:36 +02:00
Pinta 49769b3351 [MODULAR] Hypospray buffs (#7699)
* Buffs standard hypo injection speed

* more transfer ammounts
2021-08-28 02:11:34 +01:00
SkyratBot 2c63529d60 Automatic changelog generation for PR #7692 [ci skip] 2021-08-28 03:11:19 +02:00
jjpark-kb 12f795f23d venus changes (#7692)
* venus changes

* better looking code

* suggestion

* one small forget
2021-08-28 02:11:17 +01:00
SkyratBot 05e152461c Automatic changelog generation for PR #7554 [ci skip] 2021-08-28 03:11:01 +02:00
jjpark-kb 5a6f51a51c cortical borer (#7554)
* start

* saving

* so much to do, so little time

* seriously, so much

* to another pr I go and check

* awful the amount of things to do

* credit to vg

* there we go

* ghosts should hear borers to host talk too

* changes

* more changes

* oops, this ask

* increase ability cooldown, warn borers if someone died

* more chems, fix generation naming

* no pulling or pushing over tables

* borers can talk with sugar, just scramble

* borers can just fully emote now

* oh man, large commit

* changes to focus

* fucking bugs

* more changes

* no more nonorganics

* round end, objectives, etc.

* changes

* splits cortical files up

* solve something

* yea

* oops

* some changes for now

* okay, fixes borers

* logging

* come back to owner, trauma now
2021-08-28 02:10:59 +01:00
SkyratBot 6db8b3e9cc Automatic changelog generation for PR #7704 [ci skip] 2021-08-28 03:09:01 +02:00
AxieTheAxolotl 765ce3e285 [MODULAR] Readds Peacekeeper lockers with animation (#7704)
* have I told you the definition of insanity

* Update closet.dmi

* dm is a shitty coding language

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* yuh

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
2021-08-28 02:08:58 +01:00
candle :) ce7e663de9 donator item replacement (#7795)
* item replacement

* Update donator_clothing.dm

* Update donator_clothing.dm

* aaawawaeaeaea
2021-08-28 03:08:03 +02:00
SkyratBot 214f355965 Automatic changelog generation for PR #7729 [ci skip] 2021-08-28 03:07:47 +02:00
Yawet330 b7286eee33 Update guns.dm (#7729) 2021-08-28 02:07:45 +01:00
SkyratBot 3e2d7df338 Automatic changelog generation for PR #7723 [ci skip] 2021-08-28 03:06:46 +02:00
LeonY24 17ecaadfee Sec guns sprites rework (#7723)
Ostwind, Norwind, Vintorez and PCR are now dual-wielded.
2021-08-28 02:06:45 +01:00
SkyratBot 72cfecabb3 Automatic changelog generation for PR #7730 [ci skip] 2021-08-28 03:06:31 +02:00
Yawet330 8bd608fe3a [MODULAR]Fixes shitcode with breaching hammers (#7730)
* bad code go away

* Update peacekeeper_hammer.dm

* a!

* Update peacekeeper_hammer.dm

* literally 1984
2021-08-28 02:06:29 +01:00
SkyratBot 43fd716073 Automatic changelog generation for PR #7731 [ci skip] 2021-08-28 03:06:17 +02:00
Yawet330 33e5eaeb9c massively nerfs pepperballs (#7731) 2021-08-28 02:06:15 +01:00
GoldenAlpharex 62f4ff7a5b I love conflicts :) (#7733)
Co-authored-by: 小月猫 <alina.r.starkova@gmail.com>
2021-08-28 02:05:12 +01:00
Pinta 04e1240614 Update hypospray_kits.dm (#7739) 2021-08-28 02:04:54 +01:00
Pinta 0cbb33533a Interdyne (#7741) 2021-08-28 02:04:43 +01:00
SkyratBot a46fa3aae2 Automatic changelog generation for PR #7809 [ci skip] 2021-08-28 03:03:46 +02:00
FlamingLily e79c276321 Update MetaStation_skyrat.dmm (#7809) 2021-08-28 02:03:44 +01:00
SkyratBot 323813e8f4 Automatic changelog generation for PR #7813 [ci skip] 2021-08-28 03:02:48 +02:00