Commit Graph

420 Commits

Author SHA1 Message Date
zerothebigboy
b1c20269a6 he'sstillafurry 2021-05-05 03:38:14 -04:00
zerothebigboy
5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00
kappa-sama
524bb79f0e tgui machine broke 2021-03-19 15:32:53 -03:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
silicons
61ab2a5a53 logging fixes 2021-02-13 19:47:17 -07:00
silicons
8cb8ddef42 Merge pull request #13969 from Arturlang/blood_bag_tweaks
Tweaks blood bag consumption
2021-01-20 15:26:12 -07:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Arturlang
cc4c3533b7 Apply suggestions from code review
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-01-20 02:25:22 +02:00
Artur
19f27f2f59 Somehow forgot this very important detail 2021-01-14 10:57:46 +02:00
Artur
df825b4441 deltafire's suggested fixes 2021-01-12 00:23:39 +02:00
Artur
ffe20839fe tweaks loss numbers 2021-01-04 23:46:48 +02:00
Artur
6388c3cf55 Blood bag delays 2021-01-04 23:43:33 +02:00
silicons
8a471d6984 logs 2020-12-31 12:35:45 -08:00
silicons
251bd3e06b logging 2020-12-31 12:33:05 -08:00
BlackMajor
e50760f641 Lilly please that's not funny 2020-12-19 00:59:50 +13:00
BlackMajor
8f30d5a686 Update borghydro.dm 2020-12-19 00:46:04 +13:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
DeltaFire
06cb91ca3d updates all BODYPART_ORGANIC occurances
:)
2020-10-06 18:01:25 +02:00
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
silicons
8699ce2174 fixes a bunch of broken clickdelays (#13218)
* fixes

* fix
2020-08-25 20:58:20 +02:00
Trilbyspaceclone
1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
Putnam
467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
TrilbySpaceClone
3ae10ac826 update? 2020-08-06 13:09:41 -04:00
Lin
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
Trilbyspaceclone
e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
silicons
20dea7e41f fix 2020-08-01 20:45:49 -07:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons
78312c23bf sigh 2020-07-28 21:53:07 -07:00
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
Kraseo
7094649881 don't like this 2020-07-19 11:30:55 +02:00
silicons
910869d6bf more 2020-07-18 19:44:12 -07:00
silicons
1a040dd2a6 changes 2020-07-18 18:44:17 -07:00
Timothy Teakettle
1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +01:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghom
ef60068f1c Merge pull request #12666 from timothyteakettle/more-blood-fixes
More blood fixes
2020-07-02 14:52:39 +02:00
Timothy Teakettle
84d60a455e wow its still spelt wrong 2020-07-01 21:53:34 +01:00
Timothy Teakettle
1cb1b4d7e6 oh my god its not even defined right 2020-07-01 21:29:10 +01:00
Timothy Teakettle
311e149562 fix bloodpacks 2020-07-01 21:00:01 +01:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-06-29 12:44:33 -07:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
dapnee
e63f6aed42 Merge remote-tracking branch 'upstream/master' into meme 2020-06-22 15:15:28 -06:00
dapnee
0f15b0ce84 hey look, I'm finished with a single meme item
hahaha
2020-06-21 18:49:58 -06:00
dapnee
cfff6677b4 wataur
hahaha, imagine if this worked
2020-06-21 18:14:34 -06:00