 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 |
|
|
silicons
|
59372710bb
|
Update keybindings.dm
|
2020-09-17 21:41:05 -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 |
|
|
silicons
|
ca8b13b86a
|
Merge pull request #13255 from timothyteakettle/limbs
you can choose limbs to be prosthetic/amputated
|
2020-09-16 00:31:18 -07: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 |
|
|
silicons
|
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
|
38c0f8efbd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-07 18:21:54 -03:00 |
|
|
silicons
|
07b28f40de
|
Merge pull request #13359 from Ghommie/Ghommie-cit838
Turf visuals fix plus corrected names of a couple things.
|
2020-09-07 13:42:05 -07:00 |
|
|
Putnam
|
e75d1a1962
|
Signalizes ling/bloodsucker life code.
|
2020-09-07 02:00:22 -07:00 |
|
|
Ghommie
|
4a04b22b72
|
Turf visuals fix plus corrected names of a couple things.
|
2020-09-06 18:53:01 +02:00 |
|
|
Enric Gabriel
|
499fec6a16
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-06 10:42:43 -03:00 |
|
|
BlackMajor
|
1943a2fdd7
|
Merge pull request #13246 from silicons/anomaly_manufacturing
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
|
2020-09-06 17:53:35 +12:00 |
|
|
Enric Gabriel
|
486ca9a81a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-04 10:15:54 -03:00 |
|
|
silicons
|
12c5680d58
|
Merge pull request #13324 from Putnam3145/extools-logging
Added threaded extools logging as an alternative to rust_g logging.
|
2020-09-04 04:10:02 -07:00 |
|
|
timothyteakettle
|
90eef6efc9
|
Merge remote-tracking branch 'upstream/master' into limbs
|
2020-09-03 22:46:32 +01:00 |
|
|
Enric Gabriel
|
05485c4b2c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-03 15:26:38 -03:00 |
|
|
Ghommie
|
dc9b024fae
|
Blemishes begone.
|
2020-09-02 19:16:16 +02:00 |
|
|
Putnam
|
2f3edb4491
|
Added threaded extools logging as an alternative to rust_g logging.
|
2020-08-31 19:56:49 -07: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 |
|
|
silicons
|
e677804bd7
|
Merge pull request #13277 from Chiirno/AnaPanRework
Reworks Anatomic Panacea
|
2020-08-29 21:19:47 -07:00 |
|
|
silicons
|
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 |
|
|
Lynxless
|
828a65a7fd
|
New branch test
|
2020-08-27 15:46:40 -03: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 |
|
|
Timothy Teakettle
|
fe25046410
|
Merge branch 'master' into limbs
|
2020-08-27 18:06:35 +01:00 |
|
|
silicons
|
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 |
|
|
silicons
|
ec9b82381b
|
Merge pull request #13265 from timothyteakettle/rock-paper-scissors
adds rock paper scissors
|
2020-08-27 09:42:08 -07:00 |
|
|
Enric Gabriel
|
4028af4f4f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-26 12:24:38 -03:00 |
|
|
silicons
|
ff6beea525
|
rebalances shotgun shell stripper clips since no one else wants to (#13116)
* Update volumetrics.dm
* Update ammo_boxes.dm
|
2020-08-26 17:19:29 +02:00 |
|
|
Enric Gabriel
|
f70b74eca3
|
here
|
2020-08-26 12:05:06 -03:00 |
|
|
timothyteakettle
|
f908475617
|
rock paper scissors
|
2020-08-26 01:01:09 +01:00 |
|
|
timothyteakettle
|
cd7293a9a2
|
limbs
|
2020-08-24 03:19:36 +01:00 |
|
|
silicons
|
b995581a11
|
changes
|
2020-08-23 05:33:19 -07:00 |
|
|
silicons
|
bd5766a8be
|
changes
|
2020-08-23 05:27:53 -07: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 |
|
|
silicons
|
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 |
|
|
Letter N
|
afe32406c0
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-22 13:40:36 +08: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 |
|
|
silicons
|
120bcfc00c
|
Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
|
2020-08-20 21:32:26 -07:00 |
|
|
Ghom
|
1242626faa
|
Forgot the comment.
|
2020-08-20 19:01:13 +02:00 |
|
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
|
Enric Gabriel
|
b0cf18fc5a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-20 13:29:24 -03:00 |
|
|
Letter N
|
8d70e21239
|
the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it.
|
2020-08-20 19:40:47 +08:00 |
|
|
Letter N
|
2dd3d71b19
|
config©paste chang.
|
2020-08-20 16:36:24 +08:00 |
|
|
Letter N
|
3b7bca28b3
|
Functional* code
|
2020-08-20 13:50:33 +08:00 |
|