6f754188ac
funny guns go pew
2020-08-07 18:02:33 -05:00
fd8f3781cc
test commit please ignore
2020-08-07 17:03:38 -05:00
c227fc7546
wait, shit
2020-08-07 16:56:53 -05:00
14e35806b9
I hope this works
2020-08-07 16:23:15 -03:00
da48196863
stuff
2020-08-07 07:29:57 -07:00
8a0f44cb19
sounds
2020-08-07 07:23:34 -07:00
0668941669
fix
2020-08-07 07:19:41 -07:00
67b5695691
fix
2020-08-07 07:15:30 -07:00
375e764e4c
support updates
2020-08-07 06:19:39 -07:00
53f908e32b
putnamos
2020-08-07 06:09:42 -07:00
f787e2d525
whew
2020-08-07 06:03:31 -07:00
7330ee18bb
insanity
2020-08-07 05:59:26 -07:00
029d88ac9d
play a real shin megami tensei game
2020-08-07 03:32:54 -05:00
9eb7aaa2d1
fixes pumps and reverts this small vending change
2020-08-07 16:12:44 +08:00
e1e9b77b07
Update immovable_rod.dm
2020-08-07 00:36:04 -07:00
5b63f0acce
fix fix fix^2
2020-08-07 15:15:34 +08:00
aa5b99a9d4
make it end
2020-08-07 00:03:59 -07:00
4dd51f3d9c
fix
2020-08-06 23:48:05 -07:00
72d0f2a4a3
AAAAAAAA
2020-08-06 23:43:14 -07:00
65839060c9
Fixes
2020-08-06 23:39:57 -07:00
3640a33ff6
e
2020-08-06 23:22:53 -07:00
bcfc601c7a
sigh
2020-08-06 23:11:09 -07:00
8edb374a20
sigh
2020-08-06 23:09:02 -07:00
1586625e6b
Merge pull request #12960 from timothyteakettle/loadout-you-say
...
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
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
e773062b9a
reverse the loadout update
2020-08-07 03:58:19 +01:00
9e62c7b7c3
Improves zombies, the gimped threat
...
Makes zombies take no stamina damage due to being a reanimated corpse, makes zombies not enter softcrit (but still hardcrit for the fake death thing), gives the romerol kit a guide on proper usage of the chem.
2020-08-06 22:43:15 -04:00
6876edbd85
Merge pull request #12992 from Hatterhat/rifle-book-pt2
...
unatomic as shit PR about nukie guns
2020-08-06 19:40:09 -07:00
009f0ebeeb
Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff
...
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
2020-08-06 19:37:30 -07:00
add3be1654
Merge pull request #13038 from Sishen1542/blorble
...
adds *blorble and *blurp as carbon emotes
2020-08-06 19:36:38 -07:00
60b93386a1
Merge pull request #13043 from Sishen1542/boneless
...
🅱️ oneless
2020-08-06 19:35:56 -07:00
865970fcc3
lol
2020-08-06 21:34:25 -04:00
e9cbb550a1
Update laptop.dm
2020-08-06 18:09:50 -07:00
76cad8f1bf
bdm always spawns, duplicate removal maintained
2020-08-06 18:26:00 -05:00
c07495d940
Merge branch 'master' into ok-listen-its-an-accident
2020-08-06 18:39:51 +01:00
ad77a6120a
Merge pull request #13033 from Citadel-Station-13/silicons-patch-72
...
how about we not gib slimepeople for having too much blood that is a little unfun eh now they'll just take damage and bleed the excess
2020-08-06 12:31:43 -05:00
dafe9b6a38
Merge pull request #13029 from silicons/textwallers
...
attempting to send an emote above 2048 characters will now reflect it back to you without sending instead of rudely cutting off your emote mid-message.
2020-08-06 12:31:25 -05:00
3ae10ac826
update?
2020-08-06 13:09:41 -04:00
ea97e98b5c
Update _vending.dm ( #13035 )
2020-08-06 18:04:03 +02:00
333ca2cc7b
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-06 18:26:04 +08:00
8f0f30f6f7
lazy datacore fix
2020-08-06 17:27:51 +08:00
815ddd1866
oh boy
2020-08-05 21:34:26 -07:00
4fa23feb04
🅱️ oneless
2020-08-05 19:16:10 -06:00
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
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
ede59e5c4d
Merge pull request #13021 from silicons/salt_pr
...
gives ipcs silicon sound emotes
2020-08-05 19:43:54 -05:00
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
8442d69858
Merge pull request #12963 from Seris02/morefix
...
ghost chilis fixed
2020-08-05 15:44:48 -07:00
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
57be216251
Merge pull request #12995 from timothyteakettle/travelling-traders
...
a few small tweaks to travelling traders
2020-08-05 15:28:15 -07:00
Hatterhat