Commit Graph

640 Commits

Author SHA1 Message Date
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
silicons
b1ce9a9618 Update vocal_cords.dm 2021-02-08 03:09:19 -07:00
silicons
0895789217 Update vocal_cords.dm 2021-02-08 03:06:54 -07:00
TyrianTyrell
7fff6a75c0 Update tongue.dm 2021-02-07 04:29:19 -05:00
silicons
5037216f5a Update eyes.dm 2021-01-29 22:16:14 -07:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
Artur
f5dc7d5c01 Makes cursed heart more tolerable 2021-01-07 22:27:13 +02:00
Letter N
2966f985a3 rustg updates& makes shit work 2020-12-21 21:06:45 +08:00
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
DeltaFire
410ffffcc3 there we go
robot rad safe: 250, 750 with upgrade (500 for normal mobs)

Also some typo fixes
2020-11-15 20:30:50 +01:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
Vynzill
cbe9f6c12a makes eyes glow once again with high luminosity (#13554) 2020-10-15 13:37:09 +02:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
Timothy Teakettle
0c99b53c05 eyes 2020-10-03 23:22:53 +01:00
Tupinambis
d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis
a2fbd76a49 fix travis? 2020-10-01 17:37:53 -05:00
Tupinambis
f1bc1ccafb Merge branch 'master' into spooder
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
2020-10-01 17:10:42 -05:00
Timothy Teakettle
710ab0ffa6 Update eyes.dm 2020-10-01 22:06:03 +01:00
Timothy Teakettle
7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Timothy Teakettle
14e217082f compile 2020-10-01 20:51:53 +01:00
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
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
113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05: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
Timothy Teakettle
12bf3aebda Merge remote-tracking branch 'upstream/master' into cool-ipcs 2020-09-16 05:12:20 +01:00
Timothy Teakettle
125b50d392 Merge branch 'master' into cool-ipcs 2020-09-16 05:09:02 +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
Timothy Teakettle
de640254c7 tidyup 2020-09-05 20:32:22 +01:00
Timothy Teakettle
c690e59085 change accent names 2020-09-05 16:26:55 +01:00
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +01: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
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
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
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +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