ae482c1bb8
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
116145872f
commit thing, need to see changies but gitlens is denying me
2020-08-29 14:00:46 +08:00
84ed82c9e7
whyseris
2020-08-28 22:09:30 -04:00
1546347231
name
2020-08-28 20:40:27 -05:00
7ed2a3cbfe
update
2020-08-28 20:28:05 -05:00
5dd09c2402
the one where i make it work
2020-08-28 20:20:19 -05:00
578f078a2d
whoops i forgot to make it not emp
2020-08-28 16:46:55 -07:00
a7d68281a3
new changes
...
- runes can now be destroyed by non-heretics using a bible or a null rod
- mansus grasp now has a unique inhand color.
- madness grasp now has a unique inhand color.
- blood siphon is now redder.
- silence spell, lasts 20 seconds, gives an obvious message to the victim.
- fire immunity passive for ash
- guaranteed dislocation passive for flesh
- rust grasp passive for disgusting mood/vomiting
- rust grasp cooldown reduced by 75% on hit
- living heart now checks z-level when telling you where someone is.
- grasp of decay: forced corrosion for 20 seconds, can make you vomit. probably shitcode.
- madness touch: give people trauma, braindamage and a terrible mood.
- nightwatcher's rite: fire shotgun that can do 75 damage on point blank
- flesh sickle buffed a bit.
- descriptions touched up a bit.
2020-08-28 16:42:25 -07:00
2c0964a138
god this feels so much worse
2020-08-28 18:31:41 -05:00
adc75a1d50
Merge branch 'master' into revert-13122-haha
2020-08-28 15:31:38 -07:00
4f2f6b537e
credit's already given in the pr let's not
2020-08-28 13:44:41 -04:00
b76cf0004b
ui adjustment
2020-08-28 18:34:00 +01:00
1d943a34ef
heterochromia
2020-08-28 18:30:28 +01:00
96d006f551
oops
2020-08-27 23:48:19 -04:00
ca34a50726
Port "Better Explosion Echoes" by NotRanged https://github.com/Skyrat-SS13/Skyrat13/pull/3295
2020-08-27 23:39:43 -04:00
c7883775fa
Added a pref to see genitals on examine.
2020-08-27 20:22:24 -07:00
d116dd49b2
teg tweak
2020-08-27 23:04:00 -04:00
c2ded74d6a
e
2020-08-28 12:54:58 +10:00
55c8250324
AAAAAAAAAAAAAAAAA
2020-08-28 12:44:59 +10:00
1eb3473132
absolutely goes apeshit on desword data
2020-08-27 19:09:24 -05:00
b3c459c59c
okay you can use any emote
2020-08-27 21:04:36 +01:00
398692df0b
emotes
2020-08-27 20:24:37 +01:00
4caeb310f7
Added blank line to the end of files
2020-08-27 15:59:07 -03:00
828a65a7fd
New branch test
2020-08-27 15:46:40 -03:00
2df4bedb06
All the errors deleted away
2020-08-27 14:44:19 -03:00
fdc2cea077
added chem dispenser, time for errors
2020-08-27 14:27:35 -03:00
664b2490c3
Merge pull request #13235 from timothyteakettle/bokken-update
...
buffs bokkens stamina damage by 2
2020-08-27 10:07:31 -07:00
b162d8184d
Merge pull request #13237 from Hatterhat/pda-bomb-limited
...
pda bomb buyonce
2020-08-27 10:07:05 -07:00
fe25046410
Merge branch 'master' into limbs
2020-08-27 18:06:35 +01:00
2bc92145df
Merge pull request #13256 from EmeraldSundisk/coglox
...
Expands CogStation's airlocks, among other things.
2020-08-27 10:03:33 -07:00
734ed238b7
Merge pull request #13257 from timothyteakettle/so-ya-like-qol-huh
...
qol: customization features appear in alphabetical order
2020-08-27 10:03:15 -07:00
9440a92c09
Merge pull request #13258 from shellspeed1/iv-drips
...
Ports drip feeding mode for iv drips from tg.
2020-08-27 10:02:43 -07:00
bc2c658395
json
2020-08-27 18:01:08 +01:00
857c581931
Merge pull request #13232 from timothyteakettle/is-this-a-good-idea
...
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
2020-08-27 09:55:26 -07:00
ec9b82381b
Merge pull request #13265 from timothyteakettle/rock-paper-scissors
...
adds rock paper scissors
2020-08-27 09:42:08 -07:00
cf85d68ec2
Update eyes.dm
2020-08-27 09:39:27 -07:00
0351686399
Update eyes.dm
2020-08-27 09:38:39 -07:00
9f7a358bb9
plasmamen are playable now
2020-08-27 11:37:13 -05:00
54c32f9162
Update smithed_items.dm
2020-08-27 17:43:46 +10:00
c4885d81f3
Merge branch 'master' into spike-loot-differentces
2020-08-27 03:41:14 -04:00
172fe663c3
remove redundant separate tesla log and merge it into the singulo log
...
also formatting because i hate inconsistent whitespace
2020-08-27 02:46:19 -04:00
350a99a4ba
teslas now fizzle at 0 energy and adds admin log for fizzles
...
fixing the tesla engine 100% speedrun world record
2020-08-27 02:39:09 -04:00
68cb78ba51
why is this here
...
no really how the fuck did this happen
2020-08-27 00:03:58 -04:00
7840205d4e
shuffle containment checking for optimization
...
now it should be checking less (tested, functionally identical to before)
2020-08-26 23:59:15 -04:00
a988dcce73
better
2020-08-27 12:02:18 +10:00
408babe0dc
Math
2020-08-27 12:00:11 +10:00
f3990732f3
remove excess whitespace
...
title
2020-08-26 21:25:45 -04:00
6fc019ebf8
create unique containment check for the tesla
...
it now functions as normal. it only checks for containment in a 10 tile radius (this should work fine for the default setups of Delta and Lambda).
2020-08-26 21:20:23 -04:00
8d6a026153
yep
2020-08-27 00:01:54 +01:00
6c8b256e48
dont griff please
2020-08-26 20:23:19 +03:00
Letter N