timothyteakettle
b68baf2f25
this is funny
2020-08-23 01:44:33 +01:00
silicons and GitHub
68ee7b12bf
Merge pull request #13236 from timothyteakettle/lizard-fixes
...
lizards are shitcode
2020-08-22 15:19:48 -07:00
silicons and GitHub
7737e76b32
Merge pull request #13224 from Ghommie/Ghommie-cit835
...
Removing priority overlays, update_icon() splitup for guns.
2020-08-22 15:19:07 -07:00
Timothy Teakettle
60c8dd283e
shitcode begone
2020-08-22 20:02:36 +01:00
Timothy Teakettle and GitHub
88fb9d277a
fix lizard snouts ( #13223 )
2020-08-20 22:58:54 +02:00
Ghommie
fde859bca0
Removing priority overlays, update_icon() splitup for guns.
2020-08-20 18:33:23 +02:00
Timothy Teakettle
bc16a8f1b2
fix lizard snouts
2020-08-20 16:39:07 +01:00
silicons and GitHub
48652e4b0a
Merge pull request #13202 from tiramisuapimancer/master
...
Makes Ethereal hair their mutcolor instead of white
2020-08-18 18:53:40 -07:00
silicons and GitHub
0331f0cdc3
Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum
...
Revert "[TESTMERGE ONLY] FUCK"
2020-08-18 18:52:52 -07:00
tiramisuapimancer and GitHub
13609ba6e6
Update ethereal.dm
2020-08-17 23:01:01 -08:00
timothyteakettle
d312a5d639
fix tails
2020-08-18 01:32:06 +01:00
timothyteakettle
47424be1c0
tail fix
2020-08-18 00:46:05 +01:00
silicons and GitHub
7d2d4d870c
Merge pull request #13179 from Detective-Google/if-chain-begoen
...
kills an ugly if-chain in inventory code (probably)
2020-08-17 03:13:48 -07:00
Timothy Teakettle and GitHub
f5300750b5
Revert "[TESTMERGE ONLY] FUCK"
2020-08-17 03:18:36 +01:00
silicons and GitHub
4cd731ce11
Revert "cease your shitcode: cum edition"
2020-08-16 19:06:57 -07:00
silicons
8dedcbcf76
Merge branch '13113'
2020-08-16 18:53:35 -07:00
silicons
38959b6120
Merge branch '13141'
2020-08-16 18:46:33 -07:00
silicons
b7b13403b9
Merge branch '13130'
2020-08-16 18:45:54 -07:00
silicons
b56742beb5
Merge branch 'pr-13110'
2020-08-16 18:40:23 -07:00
silicons and GitHub
428bb936aa
Merge pull request #13037 from timothyteakettle/freedom-in-customisation
...
turns 304 lines of snowflake code into 24 lines
2020-08-16 18:35:05 -07:00
Detective Google
9b943ec7a9
yee
2020-08-15 21:29:39 -05:00
MrJWhit
20a9451b56
Update lizardpeople.dm
2020-08-12 21:35:36 -04:00
silicons and GitHub
569cef0e42
Update ethereal.dm
2020-08-11 17:05:32 -07:00
timothyteakettle
2a6490b60c
yes
2020-08-12 00:47:06 +01:00
timothyteakettle
cd8430a897
woops
2020-08-12 00:42:51 +01:00
timothyteakettle
a2721b1ccd
traits
2020-08-12 00:40:49 +01:00
Timothy Teakettle
45dae759df
all the homies hate travis
2020-08-11 21:04:29 +01:00
Timothy Teakettle and GitHub
4a2bbe66d6
Merge branch 'master' into cum
2020-08-11 18:30:30 +01:00
silicons and GitHub
df05c5ee4d
Merge pull request #13089 from Putnam3145/fix-sprite-display
...
Demodularization + making certain sprite overlays less hilariously jank
2020-08-11 01:43:21 -07:00
timothyteakettle
1f240b883f
holy shit
2020-08-11 03:37:04 +01:00
kiwedespars
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
Timothy Teakettle
24557c415c
i said CEASE
2020-08-10 21:42:52 +01:00
Timothy Teakettle
033fe553e8
cease your shitcode
2020-08-10 21:41:06 +01:00
silicons and GitHub
4da1d0b73c
Update human_defense.dm ( #13002 )
2020-08-09 16:06:53 +02:00
silicons and GitHub
f20f01cc6b
Merge pull request #12853 from LetterN/TGUI-4
...
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons and GitHub
fb43e9a2d2
Merge pull request #13054 from KeRSedChaplain/zombies!
...
Improves zombies, the gimped threat
2020-08-09 05:42:31 -07:00
Letter N
f1c4a7f6ac
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-09 14:54:16 +08:00
Putnam
bdee7bdc63
linters are always your friend
2020-08-08 21:38:53 -07:00
Putnam
8f77a2b16d
Demodularized a bit.
2020-08-08 13:38:33 -07:00
Putnam
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
Dan-Neposh
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
Letter N
333ca2cc7b
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-06 18:26:04 +08:00
Sishen
4fa23feb04
🅱️ oneless
2020-08-05 19:16:10 -06:00
Timothy Teakettle
14bc60955f
unlocked
2020-08-05 16:31:27 +01:00
Letter N
454baea55f
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-04 09:31:34 +08:00
silicons and GitHub
a4132c04ea
Merge pull request #12894 from timothyteakettle/wounds-part-2
...
port of wounds part 2
2020-08-03 14:43:07 -07:00
silicons and GitHub
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
82790cffed
fixes lizard code
2020-08-03 21:39:11 +08:00
silicons and GitHub
d5a19ea4b2
Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
...
prefs for headpat wagging
2020-08-03 02:30:57 -07:00
Timothy Teakettle
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
timothyteakettle