Commit Graph

6282 Commits

Author SHA1 Message Date
WanderingFox95
75fee6ec25 applies requested changes 2021-10-13 22:25:15 +02:00
WanderingFox95
afbc34eea2 Hmm 2021-10-13 22:18:07 +02:00
WanderingFox95
6763324506 Fixes the BDM's proc loop (Ported from TG) 2021-10-13 21:47:24 +02:00
Putnam3145
b6fdf671f1 Merge pull request #15215 from silicons/afk_tracking
fixes afk detection
2021-10-11 15:52:03 -07:00
Putnam3145
83ebebaa05 Merge pull request #14890 from Citadel-Station-13/silicons-patch-44
[experimental] changes to slowdown scaling
2021-10-11 15:51:33 -07:00
Putnam3145
3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
keronshb
5451e5d4d7 Space Dragon gust no longer hardstuns. (#15243)
* Removes hardstun

* oops adds the disarm
2021-10-06 17:30:13 +02:00
Chayse Ramsay
d1611ddf42 Lavaland ruin rad storm fix (#15242)
* Lavaland rad storm fix

* whoops

* double whoops

* Update Lavaland.dmm
2021-10-06 17:28:29 +02:00
Tupinambis
383f4423ac Why can't xenos eat rats and stuff. This fixes that. (#15227) 2021-10-06 17:19:59 +02:00
Lin
8f9a2b6d0c Merge pull request #15235 from silicons/pai_radio_Stuff
redoes how pai emp silencing works
2021-10-05 12:32:23 -07:00
silicons
bac7bc3fb6 fix 2021-10-03 11:29:32 -07:00
SandPoot
95b814d47e Upload files 2021-10-02 22:29:01 -03:00
silicons
5ff4a2ace5 Merge pull request #15180 from LetterN/achives-
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
silicons
f317e510f7 Merge pull request #15191 from keronshb/ninjaadjustment
Puts the ninja status back into the status window and restores the energy charge meter.
2021-09-28 00:14:42 -07:00
silicons
cefef5b0bc Merge pull request #15203 from zeroisthebiggay/buggers
Fixing (cult) slurring and stuttering never going away from non-carbon mobs.
2021-09-27 23:31:03 -07:00
silicons
b064d73b95 that too 2021-09-27 17:43:42 -07:00
silicons
ec3fbed5bb Merge pull request #15205 from zeroisthebiggay/patch-28
fixes code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used
2021-09-26 13:30:40 -07:00
silicons
6c00bb8dce Update living_blocking_parrying.dm (#15208) 2021-09-26 15:41:09 +02:00
zeroisthebiggay
be82bd310e Update plaguerat.dm 2021-09-25 19:17:43 -04:00
zeroisthebiggay
58df5b70bf Update plaguerat.dm 2021-09-25 19:09:22 -04:00
zerothebigboy
3e1f5326e3 buggers 2021-09-24 22:25:53 -04:00
keronshb
c9697f4bbf Fixes dynamic 2021-09-23 19:38:15 -04:00
zeroisthebiggay
7ba7f0d1c1 gremlins become shock immune (#15183)
* Update gremlin.dm

* Update gremlin.dm
2021-09-23 19:20:15 +02:00
keronshb
271047cf9f Ninja Change 2021-09-21 17:42:02 -04:00
Lin
a084733397 Merge pull request #15179 from Citadel-Station-13/why
adds policy configs for elite fauna and prisoner role
2021-09-20 23:58:21 -05:00
keronshb
c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb
13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -04:00
zeroisthebiggay
7fce515ca4 Update robot_modules.dm 2021-09-19 16:01:29 -04:00
zeroisthebiggay
4ab88cfcdb Update robot_modules.dm 2021-09-19 15:59:45 -04:00
zeroisthebiggay
2f903353a6 Update robot_modules.dm 2021-09-19 15:56:40 -04:00
zerothebigboy
c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	tgstation.dme
2021-09-19 15:23:52 -04:00
silicons
c60e54e0d3 Merge pull request #15074 from keronshb/paiports
PORTS PAI Emag Act
2021-09-19 11:12:02 -07:00
silicons
f48bf3cdc0 Merge pull request #15174 from buffyuwu/holoparasites
probably fixes holoparasites
2021-09-19 11:10:45 -07:00
silicons
9a393e07f8 Merge pull request #15171 from DeltaFire15/ventcrawl-I-want-to-cry
Hey raspy why can plastic golems ventcrawl even with equipment?
2021-09-19 11:08:45 -07:00
keronshb
1f71740803 . 2021-09-19 14:08:01 -04:00
silicons
1bc24575d4 Merge pull request #15084 from keronshb/plaguefix
Fixes Plague Rats + other buffs
2021-09-19 11:03:05 -07:00
keronshb
6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04:00
LetterN
0b7e514739 t 2021-09-19 14:05:28 +08:00
silicons
849dbc7fb3 sigh 2021-09-18 19:37:24 -07:00
buffyuwu
96643c7aba probably fixes holoparasites
closes #15151 if it works
2021-09-18 01:22:24 -04:00
DeltaFire
3f1d060a38 hey raspy why can plastic golems always ventcrawl 2021-09-17 21:02:58 +02:00
keronshb
7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
silicons
fb05100008 Update mouse.dm (#15115) 2021-09-15 00:16:57 +02:00
Lin
d53820d9bf Merge pull request #15130 from Citadel-Station-13/when_why
[02:58:00] Runtime in atoms.dm, line 574: type mismatch: "catghost" &= 16777215
2021-09-14 01:08:06 -05:00
silicons
6524e3d539 Update species.dm (#15126) 2021-09-14 02:23:52 +02:00
silicons
4c058114a6 Update login.dm 2021-09-12 20:37:03 -07:00
keronshb
4cb198fe05 Fixes Hitby runtime 2021-09-11 17:38:32 -04:00
keronshb
bb74dd4adf Cap fix 2021-09-10 12:01:46 -04:00
silicons
c600fae409 Merge pull request #15103 from SandPoot/cyborg-grippers
Does some nice stuff on cyborg grippers
2021-09-09 17:59:47 -07:00
Lin
0a005438ab Merge pull request #15100 from Citadel-Station-13/silicons-patch-5
salt fixes colossus crystals not reading direction anymore due to a projectile update
2021-09-09 19:51:05 -05:00