Commit Graph

24044 Commits

Author SHA1 Message Date
Letter N
e964b3aabf skillpannel fix, and nyanite fixes. Minified js does not include pai spoilers 2020-08-08 20:04:16 +08:00
Letter N
83207baaee reverts nanite thing 2020-08-08 16:30:07 +08:00
Letter N
c4b4801132 shockies 2020-08-08 15:20:03 +08:00
Letter N
9eb7aaa2d1 fixes pumps and reverts this small vending change 2020-08-07 16:12:44 +08:00
Letter N
5b63f0acce fix fix fix^2 2020-08-07 15:15:34 +08:00
Letter N
71bf63d0dd this is needed 2020-08-07 14:06:14 +08:00
Letter N
c6c78667cb atmo control fix 2020-08-07 13:58:08 +08:00
Letter N
cc98f50eb6 what if slabs still show things even if ratvar is free? Does not fix "the sleeper" though 2020-08-07 11:25:36 +08:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Letter N
8f0f30f6f7 lazy datacore fix 2020-08-06 17:27:51 +08:00
Lin
32805fc7c2 Merge pull request #12996 from silicons/typing_indicators_fix
fixes typing indicators being stuck (maybe) by using mutable appearances instead of iconstates.
2020-08-05 20:02:29 -05:00
Lin
ad4a96c73a Merge pull request #13001 from Citadel-Station-13/silicons-patch-66
makes explosions only recurse one level into storage at full power before dropping 1 level per storage object recursed
2020-08-05 19:50:57 -05:00
Lin
0ff5c90fc8 Merge pull request #12969 from silicons/e
someone asked i code holoparasites playing music so here we are???
2020-08-05 19:48:37 -05:00
Lin
ede59e5c4d Merge pull request #13021 from silicons/salt_pr
gives ipcs silicon sound emotes
2020-08-05 19:43:54 -05:00
Lin
c310b1a70e Merge pull request #12997 from silicons/lavastaff
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
2020-08-05 19:43:38 -05:00
Lin
6884204edb Merge pull request #13000 from silicons/explosion_epicenter
makes the thing that ensures explosives in bags hit everything in said bag only work if it's actually in the bag (no more pda bombs erase your entire inventory)
2020-08-05 19:43:04 -05:00
Lin
bc2e97a2a4 Merge pull request #13006 from Citadel-Station-13/silicons-patch-68
2x's volumetric storage minimum size because i'm going to stop pretending this ugly shit is usable when even i myself use opt-out to old interface
2020-08-05 19:42:28 -05:00
silicons
8442d69858 Merge pull request #12963 from Seris02/morefix
ghost chilis fixed
2020-08-05 15:44:48 -07:00
Seris02
9b02b6619d Update code/modules/hydroponics/grown/chili.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-06 06:44:17 +08:00
silicons
57be216251 Merge pull request #12995 from timothyteakettle/travelling-traders
a few small tweaks to travelling traders
2020-08-05 15:28:15 -07:00
silicons
ed5aa7c9f7 Merge pull request #12994 from kappa-sama/patch-37
removes dildo
2020-08-05 15:27:29 -07:00
silicons
bb8dfa9236 Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer
I wanna be tracer
2020-08-05 15:26:37 -07:00
silicons
f5f0d6be81 Merge pull request #12990 from timothyteakettle/tongue-patch
make tongue preference pass through cloning
2020-08-05 15:26:04 -07:00
silicons
4720fedce9 Merge pull request #13003 from Hatterhat/crusher-glaive
Proto-Kinetic Glaives - a crusher reskin
2020-08-05 15:25:48 -07:00
silicons
164201ab27 Merge pull request #12956 from Arturlang/bloodsucker_death_lessspam
Makes bloodsucker death not spam now actually working
2020-08-05 15:15:30 -07:00
silicons
2d697e1867 Merge pull request #12926 from GlitchyCore/master
Adds a new fun round end sound
2020-08-05 15:14:20 -07:00
silicons
add9d5d0a0 Merge pull request #12889 from timothyteakettle/quirks-are-dumb
minor quirk changes
2020-08-05 15:13:52 -07:00
silicons
b2052a16cb Merge pull request #13008 from zeroisthebiggay/powercreepislife
nukies can buy holoparasites not including support ones
2020-08-05 15:13:13 -07:00
silicons
f3e0255f7f Merge pull request #13009 from Ludox235/ai-screams
Total law changes: 110
2020-08-05 15:12:53 -07:00
silicons
ffe3eeecde Merge pull request #13017 from Hatterhat/coor-dharges
door charges no longer unconscious() you
2020-08-05 15:09:14 -07:00
silicons
9b14dff46b Merge pull request #13025 from Trilbyspaceclone/tea
Tea Party
2020-08-05 15:07:55 -07:00
Letter N
f2f6416105 fixes - radio, broken - crewmanifest, gastank controler 2020-08-05 20:34:09 +08:00
lolman360
61ed83027d asj 2020-08-05 18:40:33 +10:00
Letter N
ed67801590 what if the tgui actualy recives it's topic? 2020-08-05 09:21:19 +08:00
TrilbySpaceClone
5d5459a318 Merge branch 'tea' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into tea 2020-08-04 10:07:10 -04:00
TrilbySpaceClone
f2e4b7eacc grammer 2020-08-04 10:07:04 -04:00
Trilbyspaceclone
4ea05ab07e Update drink_reagents.dm 2020-08-04 09:33:05 -04:00
TrilbySpaceClone
0f29235e6a Tea Party 2020-08-04 09:15:44 -04:00
Letter N
07c02e1c99 Commit message. Fixes slab 2020-08-04 16:26:30 +08:00
silicons
bbcc36bdec ok 2020-08-03 22:31:31 -07:00
Hatterhat
4df9efb076 heho attack text 2020-08-04 00:29:30 -05:00
Letter N
7c7d635193 what if atmos relief works? and all the other ui's gets updated 2020-08-04 12:54:55 +08:00
Hatterhat
6420914290 k 2020-08-03 23:45:34 -05:00
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
silicons
3b1826ce82 Update portable_turret.dm 2020-08-03 18:29:11 -07:00
Hatterhat
157d5c29a6 door charge nerf (tentative) 2020-08-03 19:47:04 -05:00
silicons
a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
2020-08-03 14:43:07 -07:00
silicons
75641d922e this'll probably be better 2020-08-03 13:02:25 -07:00
silicons
db8abc006a Merge pull request #13010 from Seris02/fixeslizards
lizards no longer break their spines ~~roundstart~~ EVER AGAIN I FUCKING FIXED THE DOUBLE SET_SPECIES LIZARD BUG
2020-08-03 12:54:00 -07:00
Seris02
5551e323cc Update tails.dm 2020-08-03 21:41:30 +08:00