 Enric Gabriel
|
d2257abe86
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-19 13:21:18 -03:00 |
|
|
siliconsandGitHub
|
54f48c3754
|
Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
Some bodypart-related fixes
|
2020-09-19 06:02:32 -07:00 |
|
|
Enric Gabriel
|
d85ebed8db
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-16 16:22:36 -03:00 |
|
|
siliconsandGitHub
|
ca8b13b86a
|
Merge pull request #13255 from timothyteakettle/limbs
you can choose limbs to be prosthetic/amputated
|
2020-09-16 00:31:18 -07:00 |
|
|
DeltaFire
|
f892309903
|
fixes
|
2020-09-15 17:35:58 +02:00 |
|
|
Timothy Teakettle
|
744792742b
|
please fix it
|
2020-09-12 22:32:06 +01:00 |
|
|
Enric Gabriel
|
ef96fd6389
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-11 18:51:33 -03:00 |
|
|
siliconsandGitHub
|
563b21d8fa
|
Merge pull request #13363 from Putnam3145/bloodsucker-ling-life-code
Signalizes ling/bloodsucker life code.
|
2020-09-11 14:15:37 -07:00 |
|
|
Blue Wildrose
|
1b77e69fb4
|
Slimepeople diet changes
|
2020-09-09 18:11:25 -07:00 |
|
|
Enric Gabriel
|
242400a5d6
|
push the files
|
2020-09-07 20:40:03 -03:00 |
|
|
Putnam
|
12b879c777
|
oh yeah xenos had handle_changeling (??)
|
2020-09-07 03:28:39 -07:00 |
|
|
Putnam
|
e75d1a1962
|
Signalizes ling/bloodsucker life code.
|
2020-09-07 02:00:22 -07:00 |
|
|
Enric Gabriel
|
d286153128
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-04 19:08:14 -03:00 |
|
|
timothyteakettle
|
90eef6efc9
|
Merge remote-tracking branch 'upstream/master' into limbs
|
2020-09-03 22:46:32 +01:00 |
|
|
timothyteakettle
|
798e11c407
|
logic
|
2020-09-03 22:36:38 +01:00 |
|
|
deathride58
|
1c9a22fa5e
|
Readds the old temperature notification method in the form of a shivering/sweating notification
|
2020-09-03 01:35:28 -04:00 |
|
|
Enric Gabriel
|
c10471fac9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 01:42:29 -03:00 |
|
|
siliconsandGitHub
|
84734591ed
|
Merge pull request #13268 from timothyteakettle/accents
separates tongues speech handling into accent datums
|
2020-08-29 21:22:11 -07:00 |
|
|
siliconsandGitHub
|
7ad037ee53
|
Merge pull request #13276 from timothyteakettle/emotes
every emote is unrestricted
|
2020-08-29 21:21:01 -07:00 |
|
|
siliconsandGitHub
|
5f7d80eab2
|
Merge pull request #13281 from Putnam3145/examine-pref
Added genital/vore examine text prefs
|
2020-08-29 21:19:03 -07:00 |
|
|
Letter N
|
fe17bee28e
|
reverts thing kev said about
|
2020-08-29 14:36:41 +08:00 |
|
|
Letter N
|
ae482c1bb8
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-29 14:09:56 +08:00 |
|
|
Putnam
|
c7883775fa
|
Added a pref to see genitals on examine.
|
2020-08-27 20:22:24 -07:00 |
|
|
Timothy Teakettle
|
b3c459c59c
|
okay you can use any emote
|
2020-08-27 21:04:36 +01:00 |
|
|
Enric Gabriel
|
0db4397e7c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-27 14:07:17 -03:00 |
|
|
siliconsandGitHub
|
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 |
|
|
siliconsandGitHub
|
ec9b82381b
|
Merge pull request #13265 from timothyteakettle/rock-paper-scissors
adds rock paper scissors
|
2020-08-27 09:42:08 -07:00 |
|
|
timothyteakettle
|
8d6a026153
|
yep
|
2020-08-27 00:01:54 +01:00 |
|
|
timothyteakettle
|
5cf06be877
|
cancel on move
|
2020-08-26 01:09:51 +01:00 |
|
|
timothyteakettle
|
f908475617
|
rock paper scissors
|
2020-08-26 01:01:09 +01:00 |
|
|
Enric Gabriel
|
45c5d5d81d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-25 16:06:57 -03:00 |
|
|
siliconsandGitHub
|
8699ce2174
|
fixes a bunch of broken clickdelays (#13218)
* fixes
* fix
|
2020-08-25 20:58:20 +02:00 |
|
|
Enric Gabriel
|
d5a07af36d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-23 22:25:23 -03:00 |
|
|
timothyteakettle
|
b68baf2f25
|
this is funny
|
2020-08-23 01:44:33 +01:00 |
|
|
Enric Gabriel
|
f759503b49
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-22 20:30:49 -03:00 |
|
|
Timothy Teakettle
|
c1a4ad5ea4
|
non greyscale moths deserve love too
|
2020-08-22 23:28:03 +01:00 |
|
|
siliconsandGitHub
|
68ee7b12bf
|
Merge pull request #13236 from timothyteakettle/lizard-fixes
lizards are shitcode
|
2020-08-22 15:19:48 -07:00 |
|
|
siliconsandGitHub
|
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 |
|
|
Letter N
|
afe32406c0
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-22 13:40:36 +08:00 |
|
|
timothyteakettle
|
613880b9b0
|
saves and moths
|
2020-08-21 23:32:43 +01:00 |
|
|
timothyteakettle
|
a75d91299a
|
yep
|
2020-08-21 23:16:44 +01:00 |
|
|
Timothy Teakettle
|
cbe9d05fb6
|
fuck
|
2020-08-21 21:08:17 +01:00 |
|
|
Letter N
|
f04918bdca
|
working code?
|
2020-08-21 15:09:49 +08:00 |
|
|
Enric Gabriel
|
b0662f5e39
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-21 02:19:20 -03:00 |
|
|
timothyteakettle
|
709ddb4e58
|
test
|
2020-08-21 03:48:30 +01:00 |
|
|
Timothy TeakettleandGitHub
|
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 |
|
|
Letter N
|
2dd3d71b19
|
config©paste chang.
|
2020-08-20 16:36:24 +08:00 |
|