Commit Graph

5309 Commits

Author SHA1 Message Date
Timothy Teakettle
dedfdf224d Revert "Revert "customizable eyes""
This reverts commit 9f3d745d80.
2020-10-11 16:54:53 +01:00
Timothy Teakettle
b76b97fbe9 Revert "Revert "eyes""
This reverts commit 4526fef297.
2020-10-11 16:54:50 +01:00
Timothy Teakettle
4526fef297 Revert "eyes"
This reverts commit 0c99b53c05.
2020-10-11 16:54:12 +01:00
Timothy Teakettle
9f3d745d80 Revert "customizable eyes"
This reverts commit dc70d17a1e.
2020-10-11 16:54:09 +01:00
Timothy Teakettle
d3a042deaa Revert "Merge branch 'master' into eye-sprites"
This reverts commit b48f4b91e6, reversing
changes made to dc70d17a1e.
2020-10-11 16:54:05 +01:00
Timothy Teakettle
b650fa1761 Revert "finishing touches"
This reverts commit 05aef528d7.
2020-10-11 16:54:01 +01:00
Timothy Teakettle
c770a90ccb Revert "cleanup"
This reverts commit 1fc7d9a21e.
2020-10-11 16:53:57 +01:00
Timothy Teakettle
1fc7d9a21e cleanup 2020-10-08 17:43:56 +01:00
Timothy Teakettle
05aef528d7 finishing touches 2020-10-04 17:33:46 +01:00
Timothy Teakettle
b48f4b91e6 Merge branch 'master' into eye-sprites 2020-10-04 01:23:03 +01:00
timothyteakettle
dc70d17a1e customizable eyes 2020-10-04 01:19:29 +01:00
Timothy Teakettle
0c99b53c05 eyes 2020-10-03 23:22:53 +01:00
silicons
d5ff552f3e Merge pull request #13494 from monster860/patch-4
Makes the slimeperson swap-body UI stay open when you switch bodies
2020-10-03 14:22:11 -07:00
silicons
0393ffe0c3 Merge pull request #13489 from timothyteakettle/species-color-define
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
silicons
3e6428567a Merge pull request #13488 from DeltaFire15/pacifist-parry-fix
No harmful parry countering for pacifists.
2020-10-03 14:20:07 -07:00
Putnam
737257552a Fixes ghost funny + keeps SDGF view fix. 2020-10-02 23:17:12 -07:00
Maxim Nikitin
4b6870ed1b the fuck 2020-10-02 12:07:09 -04:00
Maxim Nikitin
64b4abca4b oopsie 2020-10-02 12:05:05 -04:00
Maxim Nikitin
96d46ca0e4 Makes the slimeperson swap-body UI stay open when you switch bodies 2020-10-02 12:03:24 -04:00
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
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
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
67825fef74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into CarbonHydrogenBromine 2020-09-30 19:21:21 -05: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
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
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
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Putnam
39ac36c073 Changed an inaccurate comment. 2020-09-20 00:09:45 -07:00
silicons
54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
Some bodypart-related fixes
2020-09-19 06:02:32 -07:00