Commit Graph

25380 Commits

Author SHA1 Message Date
Timothy Teakettle
d37d7bddae Update jellypeople.dm 2020-10-08 04:20:42 +01:00
timothyteakettle
9d99061ff5 what the fuck git 2020-10-07 23:40:59 +01:00
Timothy Teakettle
e2c6a19da7 Merge branch 'master' into slime-puddle 2020-10-07 23:37:30 +01:00
Putnam3145
64ee40b185 Merge pull request #13449 from Citadel-Station-13/silicons-patch-4
ok it turns out extools hooked procs do not play nice with call() or something so let's add admin proccall wrappers for some important atmospherics procs so i can flex the ability to undo atmospherics grief with one line of sdql2
2020-10-07 15:10:48 -07:00
Putnam3145
6b536c23c7 Merge pull request #13480 from Citadel-Station-13/silicons-patch-7
[OH GOD TESTMERGE THIS FIRST] another microoptimization to GetAllContents() because microoptimizations are fun
2020-10-07 15:09:26 -07:00
Putnam3145
ec091f9f99 Merge pull request #13453 from Citadel-Station-13/silicons-patch-5
microoptimization to get rad contents
2020-10-07 15:08:32 -07:00
Putnam3145
4b700a3ff7 Merge pull request #13490 from Citadel-Station-13/silicons-patch-8
kind of easy to tell if you have a fake virus if it's ticking at 20 times the speed of a normal virus right
2020-10-07 15:08:12 -07:00
Putnam3145
3edc471012 Merge pull request #13517 from Citadel-Station-13/silicons-patch-11
"are you sure we should remove mobs from the immunity typecache" v2: electric boogaloo
2020-10-07 15:07:52 -07:00
silicons
eda0eda754 Update movement.dm 2020-10-07 10:46:00 -07:00
silicons
d2ce51ccb9 Merge pull request #13526 from Putnam3145/fix-vore-AGAIN-PLEASE
Adds a line that actually saves vore prefs to the vore pref saving
2020-10-06 17:06:08 -07:00
silicons
56a7499cef Merge pull request #13496 from Detective-Google/deadchat-kablooey
allows players in deadchat to see explosions
2020-10-06 17:05:06 -07:00
silicons
3557f00316 Merge pull request #13498 from deathride58/lingbloodupgrade
Lingblood rework (Loudness is now an average, rather than a sum)
2020-10-06 17:04:38 -07:00
silicons
3fa0bf37ff Merge pull request #13501 from Putnam3145/fix-firelocks
Made holofirelocks work.
2020-10-06 17:04:01 -07:00
silicons
efc4e089c9 Merge pull request #13503 from Hatterhat/glaive-knuckledagger
survival daggers, luxpod capsule resprite, glaive sprite tweaks soon (tm)
2020-10-06 17:03:44 -07:00
silicons
db6e5d86d8 Merge pull request #13504 from zeroisthebiggay/yeah
buffs stands in general, adds gravitokinetic stand type from tg, fixes broken protector shield
2020-10-06 17:03:16 -07:00
silicons
eae67e38f4 Merge pull request #13509 from EmeraldSundisk/helter
Slight adjustment to the "Skelter" ruin.
2020-10-06 17:02:24 -07:00
silicons
755e539bf3 Merge pull request #13523 from Detective-Google/patch-2
fixes arcade carpet
2020-10-06 17:01:59 -07:00
silicons
df2f086c42 Merge pull request #13519 from Detective-Google/licc
licking people is now an epic radial
2020-10-06 17:01:35 -07:00
silicons
c828bd586c Merge pull request #13516 from yorii/patch-1
fixes rounding error in growthstages
2020-10-06 17:01:15 -07:00
silicons
bbc0dc982d Merge pull request #13514 from Thalpy/JacqFixes2020edition
Jacq fixes2020edition
2020-10-06 17:00:39 -07:00
silicons
f6bbfc2c88 Merge pull request #13513 from timothyteakettle/eye-sprites
adds selectable eye types to customization
2020-10-06 16:51:44 -07:00
silicons
8eac1cb939 Merge pull request #13511 from Hatterhat/hakitavolver
additional revolver sprites
2020-10-06 16:51:18 -07:00
silicons
03a47bda6d Merge pull request #13252 from timothyteakettle/loadout-loading
qol: looking at loadout equips your loadout items on you instead of job items
2020-10-06 16:50:08 -07:00
Hatterhat
5a517be5e7 thanks toriate 2020-10-06 12:47:00 -05:00
Putnam3145
a2889c90f1 Merge pull request #13512 from Hatterhat/cryoscreech-fix
cant believe nobody realized the issue - fixes cryo announcements
2020-10-06 09:57:34 -07:00
Putnam
a1ea398283 Fixes vore saving once and for all. 2020-10-06 01:02:47 -07:00
silicons
655d505316 Merge pull request #13507 from LetterN/subsystem-updoots
Ports the better statpannel design, fixes missing icons, and fixes statvoting [ready]
2020-10-06 00:46:13 -07:00
Hatterhat
2e7101fdc5 funny revolver sprites - squashed 2020-10-05 22:56:52 -05:00
Detective-Google
260ed6eff6 fixes arcade carpet 2020-10-05 21:27:42 -05:00
Fermi
f75b7a4f69 Errant comment 2020-10-06 00:22:38 +01:00
Fermi
6cc34d7779 Sneaky spans 2020-10-06 00:06:09 +01:00
Fermi
ab27d5dd30 few new barth items and span fixes 2020-10-05 23:42:00 +01:00
Fermi
bf5f755440 Oops missed something 2020-10-05 23:29:37 +01:00
Fermi
8301d3100c updates lore, runes and tgui 2020-10-05 23:03:14 +01:00
silicons
915d2c726b Merge pull request #13518 from TheObserver-sys/spritefixmaybe
Plant Sprite Fixes II: The Mycus must grow! (And the grass should die)
2020-10-05 10:21:37 -07:00
Letter N
9819e90b30 all done 2020-10-05 20:08:55 +08:00
Letter N
1b30fbf703 Update statpanel.dm 2020-10-05 20:07:04 +08:00
Letter N
ea48dd1e2e part 2 2020-10-05 20:02:12 +08:00
Fermi
d4bc7bf562 unnessicary returns 2020-10-05 00:44:47 +01:00
Fermi
0d0b9601be Jacq can walk again! 2020-10-05 00:43:20 +01:00
Fermi
e2ff214d6b Justin hates catgirls 2020-10-04 22:31:10 +01:00
Detective Google
2840fe20b8 thank you kevinz 2020-10-04 16:06:19 -05:00
Detective Google
78cc2d95f3 licking people is now an epic radial 2020-10-04 15:55:02 -05:00
Detective Google
6d14d37e5f adds deadchat span 2020-10-04 13:34:36 -05:00
silicons
ce58fe4661 Update gas_mixture.dm 2020-10-04 09:46:14 -07:00
Timothy Teakettle
05aef528d7 finishing touches 2020-10-04 17:33:46 +01:00
The0bserver
6304a4010b provisional chanterelle fix 2020-10-04 01:41:57 -04:00
The0bserver
16425912da fairygrass-dead -> grass-dead 2020-10-04 01:14:03 -04:00
silicons
2e557b2f26 Update simple_animal.dm 2020-10-03 19:51:20 -07:00
yorii
42db9371de fixes rounding error in growthstages 2020-10-04 03:47:01 +02:00