zerothebigboy
|
4c82eeeb2a
|
soup
|
2021-09-18 18:18:04 -04:00 |
|
zerothebigboy
|
68e2eb1d7a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
|
2021-09-10 12:12:57 -04:00 |
|
zerothebigboy
|
ccfde52b0d
|
code
|
2021-09-02 23:45:03 -04:00 |
|
zerothebigboy
|
30134a0d2f
|
cool
|
2021-09-01 06:32:33 -04:00 |
|
silicons
|
d59ced8f28
|
changes
|
2021-06-28 19:15:29 -07:00 |
|
silicons
|
5ef742ffc1
|
logic
|
2021-06-28 18:46:25 -07:00 |
|
silicons
|
e690cea147
|
fix
|
2021-06-28 18:33:14 -07:00 |
|
silicons
|
40f2c06f2e
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-07 16:47:11 -07:00 |
|
zerothebigboy
|
b1c20269a6
|
he'sstillafurry
|
2021-05-05 03:38:14 -04:00 |
|
zerothebigboy
|
5138d86655
|
skylarlineman'safurry
|
2021-05-05 03:35:25 -04:00 |
|
silicons
|
d547aa7ff1
|
almost compiling
|
2021-04-26 23:37:26 -07:00 |
|
silicons
|
1585d1c2be
|
fixes
|
2021-04-26 23:32:33 -07:00 |
|
silicons
|
275b532a8c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-04-26 14:17:43 -07:00 |
|
kappa-sama
|
524bb79f0e
|
tgui machine broke
|
2021-03-19 15:32:53 -03:00 |
|
silicons
|
8fc1dc9c29
|
changes
|
2021-02-28 00:40:04 -07:00 |
|
silicons
|
e483ce8dfc
|
changes
|
2021-02-28 00:05:32 -07:00 |
|
silicons
|
70b8d833c0
|
changes
|
2021-02-28 00:00:14 -07: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 |
|