Commit Graph

984 Commits

Author SHA1 Message Date
silicons
d8e58b1c48 Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
silicons
b7650f3dea Merge pull request #13398 from timothyteakettle/wound-config
wound config values, wound bonus for how damaged a limb is
2020-10-01 03:02:35 -07:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Tupinambis
d2500fe389 Adds Methane and Methyl Bromide 2020-09-27 15:15:58 -05:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
timothyteakettle
c3bea5f77b wounds 2020-09-15 23:50:26 +01:00
timothyteakettle
7be15afb32 config 2020-09-15 23:20:11 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
silicons
a668251de6 Merge pull request #13353 from timothyteakettle/accent-tidyup
further accent modifications because holy shit
2020-09-08 10:31:45 -07:00
BlackMajor
1f96766699 Merge pull request #13273 from Citadel-Station-13/silicons-patch-2
slightly more intuitive eyebeam clamping
2020-09-08 12:05:10 +12:00
Timothy Teakettle
98a7332e23 is this really the root of the issue 2020-09-06 21:02:24 +01:00
Timothy Teakettle
8fe55e1317 travis what the fuck 2020-09-06 19:16:30 +01:00
Timothy Teakettle
d51fb00ebf makes more sense this way 2020-09-06 18:57:17 +01:00
Timothy Teakettle
5f5455add1 yes 2020-09-06 18:48:59 +01:00
BlackMajor
fb531e88d8 Merge pull request #13073 from Citadel-Station-13/silicons-patch-84
you can no longer attack people with surgical tools if you are in help intent
2020-09-06 17:49:35 +12:00
Timothy Teakettle
de640254c7 tidyup 2020-09-05 20:32:22 +01:00
Putnam3145
d6127d71a8 Merge pull request #13352 from timothyteakettle/fix-accents-but-pushed-this-time
lets ipcs talk but i actually push my changes this time
2020-09-05 08:40:31 -07:00
Timothy Teakettle
c690e59085 change accent names 2020-09-05 16:26:55 +01:00
silicons
84734591ed Merge pull request #13268 from timothyteakettle/accents
separates tongues speech handling into accent datums
2020-08-29 21:22:11 -07:00
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +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
cf85d68ec2 Update eyes.dm 2020-08-27 09:39:27 -07:00
silicons
0351686399 Update eyes.dm 2020-08-27 09:38:39 -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
9c893b3893 Update tools.dm 2020-08-07 17:18:49 -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