Commit Graph

6091 Commits

Author SHA1 Message Date
Timothy Teakettle cd81cd4402 why 2020-10-01 21:19:40 +01:00
Timothy Teakettle 7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Tupinambis 5d4429a61a You can now have none 2020-10-01 12:57:07 -05:00
Timothy Teakettle e1123ad7fe color define 2020-10-01 18:55:32 +01:00
DeltaFire 173ecfaa6c prevents pacifists from performing harmful counter attacks 2020-10-01 17:58:14 +02:00
DeltaFire d54a899695 fixes KA modkits being installed in borgs by others
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02: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 38c25bdc9d Merge pull request #13466 from Putnam3145/sdgf-fix
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
silicons bb09acff4c Merge pull request #13463 from timothyteakettle/slime-sprites
adds luminescent and stargazer sprites as selectable body sprites for slimes
2020-10-01 03:06:41 -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
Ghom 7f08969f48 Merge pull request #13457 from SandPoot/master
Fixes not getting an action button.
2020-10-01 11:44:22 +02:00
Putnam3145 22ca31e7d4 Merge pull request #13422 from Citadel-Station-13/species_slowdown_fix
Fixes angels not being fast while flying
2020-10-01 02:40:18 -07:00
Tupinambis b60e22eaba Fragility. 2020-09-30 19:39:54 -05:00
Tupinambis 67825fef74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into CarbonHydrogenBromine 2020-09-30 19:21:21 -05:00
Tupinambis 0bb889932d Completed! 2020-09-30 19:05:56 -05:00
timothyteakettle 27c5897c4d update button icon and stand up 2020-10-01 00:17:17 +01:00
Zandario da0c7a0ff2 Merge remote-tracking branch 'upstream/master' into species-refactor 2020-09-30 17:06:54 -05:00
Tupinambis a3a5fe4c2d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into spooder 2020-09-30 16:07:21 -05:00
Timothy Teakettle 16735e0190 silent paralysis 2020-09-30 21:40:42 +01:00
Timothy Teakettle 6b46fdbc32 fine 2020-09-30 21:16:09 +01:00
Tupinambis 113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
Timothy Teakettle 7cab2c658d Merge branch 'master' into slime-puddle 2020-09-30 18:43:25 +01:00
Timothy Teakettle 2223cfeb28 better 2020-09-30 18:41:30 +01:00
silicons 9f3b456583 Merge pull request #13416 from BlueWildrose/slimenoises
Unique slimeperson screams and laughter, and adds new customizable speech verbs
2020-09-30 09:22:25 -07:00
Timothy Teakettle d783eb58bd more traits 2020-09-30 02:58:58 +01:00
Timothy Teakettle f9cf7429e1 icons and traits 2020-09-30 02:49:21 +01:00
timothyteakettle ccb774b8f2 puddles 2020-09-30 02:15:34 +01:00
Zandario 515c842976 Part 1 2020-09-29 15:14:27 -05:00
Timothy Teakettle 1b75ccb39d puddle 2020-09-29 18:38:25 +01:00
Putnam 4d2a2b178b Made transfer_ckey reset view range. 2020-09-29 04:11:01 -07:00
Putnam 8a01b949bf Cleaned up SDGF and consistencised clones. 2020-09-29 03:47:09 -07:00
Timothy Teakettle 29368a4479 sprites 2020-09-28 18:55:01 +01:00
Enric Gabriel f487a79922 upload headcrab.dm 2020-09-27 20:05:25 -03:00
Tupinambis d2500fe389 Adds Methane and Methyl Bromide 2020-09-27 15:15:58 -05:00
silicons 7300ab26e3 Merge pull request #13439 from Tupinambis/polywantabugfix
Fixes a 5+ year old bug with ghost poly's hex value that potentially causes runtimes and crashes.
2020-09-27 00:37:06 -07:00
silicons c6d7bc886f Merge pull request #13414 from Putnam3145/its-2-seconds-yall
Fixed an erroneous comment that may cause issues.
2020-09-27 00:10:26 -07:00
silicons 00ab73d0a3 Merge pull request #13286 from timothyteakettle/heterochromia
heterochromia: you can select individual eye colours
2020-09-27 00:01:00 -07:00
Tupinambis cd5b108627 Alpha 2020-09-26 12:47:11 -05:00
Tupinambis 63c24e31b1 fixes a 5 year old hex value bug 2020-09-26 00:14:32 -05:00
silicons 57c4a3416a Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-25 01:03:15 -07:00
Timothy Teakettle 106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
CoreFlare 1901677fdb finally. species_traits=list(HAIR) 2020-09-23 19:11:34 +01:00
silicons ee44cfc565 Update angel.dm 2020-09-22 22:06:11 -07:00
silicons 731bab4bc9 Update angel.dm 2020-09-22 16:20:47 -07:00
silicons b3f145de10 Update species.dm 2020-09-22 16:20:13 -07:00
Blue Wildrose 006a625504 Slimeperson screams and laughter! 2020-09-22 02:41:11 -07:00
silicons 4ab064a50d fix 2020-09-21 20:58:33 -07:00
silicons 31791df2bd fixes 2020-09-21 20:38:43 -07:00
silicons 2c4dc4d1a9 ok 2020-09-21 19:08:21 -07:00
silicons ddc7f10de7 fixes 2020-09-21 18:35:42 -07:00