Commit Graph

962 Commits

Author SHA1 Message Date
silicons
84734591ed Merge pull request #13268 from timothyteakettle/accents
separates tongues speech handling into accent datums
2020-08-29 21:22:11 -07: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
timothyteakettle
8d6a026153 yep 2020-08-27 00:01:54 +01:00
silicons
c264d90140 Update eyes.dm (#13254) 2020-08-26 18:00:27 +02:00
timothyteakettle
29ce240903 yes 2020-08-21 23:17:40 +01:00
timothyteakettle
a75d91299a yep 2020-08-21 23:16:44 +01:00
Timothy Teakettle
b953622e6f FUCK 2020-08-21 22:14:50 +01:00
Timothy Teakettle
cbe9d05fb6 fuck 2020-08-21 21:08:17 +01:00
timothyteakettle
709ddb4e58 test 2020-08-21 03:48:30 +01:00
Putnam
bdee7bdc63 linters are always your friend 2020-08-08 21:38:53 -07:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
silicons
a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
2020-08-03 14:43:07 -07:00
Seris02
5551e323cc Update tails.dm 2020-08-03 21:41:30 +08:00
Seris02
82790cffed fixes lizard code 2020-08-03 21:39:11 +08:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Timothy Teakettle
36d6246bc1 it is now harder to deal wounds 2020-07-26 18:54:57 +01:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
Timothy Teakettle
c1932be528 last second edit woops 2020-07-25 21:53:11 +01:00
Timothy Teakettle
8b2a92994f less rng reliance 2020-07-25 20:14:41 +01:00
Timothy Teakettle
3a894f79d0 less rng reliant this is way better 2020-07-25 19:56:46 +01:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
timothyteakettle
0ccbe0b793 it works 2020-07-22 14:49:22 +01:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
Timothy Teakettle
fdfee756b7 you can enter stamcrit now 2020-07-19 18:18:22 +01:00
timothyteakettle
74b2764591 sprites and some missed things 2020-07-18 03:08:03 +01:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
timothyteakettle
8bb9b11922 Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port 2020-07-18 01:26:41 +01:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +01:00
Timothy Teakettle
93b4570f8d more changes 2020-07-17 23:23:47 +01:00
Lin
e143b69aa6 Merge pull request #12741 from Hatterhat/vog-but-with-less-line-changes
removing vog's ability to commit sin, probably
2020-07-13 11:31:25 -05:00
Hatterhat
eb0e0b6cbd i may not test my shit but at least i can have less line changes motherfucker 2020-07-11 23:18:17 -05:00
Lin
955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy
policy configuration & support hooks for clone memory disorder
2020-07-11 16:40:38 -05:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Lin
d04b335d1a Merge pull request #12652 from silicons/cool
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
2020-07-04 14:12:43 -05:00
silicons
cbad654371 Merge pull request #12632 from Ghommie/Ghommie-cit823
Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size
2020-07-02 01:44:09 -07:00
silicons
e2975a44a1 Merge branch 'master' into policy 2020-07-02 01:23:19 -07:00
silicons
f03343b516 fix 2020-06-30 05:19:50 -07:00
silicons
7a2818d657 fix 2020-06-29 23:45:18 -07:00
silicons
6a91ce8416 fix 2020-06-29 23:43:53 -07:00
silicons
3b3a3ad44e nayser 2020-06-29 23:37:51 -07:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghommie
6e90560173 Nerfs natural stamina recovery outside of stam-crit. 2020-06-28 02:40:16 +02:00
silicons
1d4a54d880 log 2020-06-26 23:47:16 -07:00
silicons
0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00