Commit Graph
1255 Commits
Author SHA1 Message Date
siliconsandGitHub 26eebf3b32 Merge pull request #13408 from YakumoChen/dont-be-a-dick-shinji
Get in the damn robot, Skylar
2020-09-20 21:24:08 -07:00
Jay b69c467047 added wrong state for halo and skirt, fixed with this 2020-09-19 20:19:49 -05:00
YakumoChenandGitHub d9539db437 adds mech suits (properly) 2020-09-18 17:39:00 -04:00
YakumoChenandGitHub 0e7049868c Add files via upload 2020-09-18 16:45:40 -04:00
siliconsandGitHub ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs
you can choose limbs to be prosthetic/amputated
2020-09-16 00:31:18 -07:00
Jay 511b845b75 donator 2020-09-13 15:32:09 -05:00
siliconsandGitHub 45ee1cbbf8 Merge pull request #13334 from CameronWoof/revert-12739-DRAKEBORG
Revert Drakeborgs
2020-09-06 15:22:16 -07:00
siliconsandGitHub e110945568 Merge pull request #13289 from kiwedespars/heretics-touchup
heretics touchup
2020-09-05 02:15:21 -07:00
timothyteakettle 90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
timothyteakettle 9e2ee588c9 rp prosthetics 2020-09-03 22:05:21 +01:00
deathride58 1c9a22fa5e Readds the old temperature notification method in the form of a shivering/sweating notification 2020-09-03 01:35:28 -04:00
Cameron!andGitHub e3af0d654e Revert "[READY] DRAKEBORGS & PLUSHIES" 2020-09-02 17:47:22 -07:00
timothyteakettle 594fd17f23 test 2020-09-02 15:34:13 +01:00
siliconsandGitHub 6348dd7d13 Revert "removes two unused sprites" 2020-08-31 21:06:18 -07:00
siliconsandGitHub e677804bd7 Merge pull request #13277 from Chiirno/AnaPanRework
Reworks Anatomic Panacea
2020-08-29 21:19:47 -07:00
siliconsandGitHub 67e946d312 Merge pull request #13184 from timothyteakettle/two-joke-sprites
removes two unused sprites
2020-08-29 21:16:04 -07:00
kiwedespars a7d68281a3 new changes
- runes can now be destroyed by non-heretics using a bible or a null rod
- mansus grasp now has a unique inhand color.
- madness grasp now has a unique inhand color.
- blood siphon is now redder.
- silence spell, lasts 20 seconds, gives an obvious message to the victim.
- fire immunity passive for ash
- guaranteed dislocation passive for flesh
- rust grasp passive for disgusting mood/vomiting
- rust grasp cooldown reduced by 75% on hit
- living heart now checks z-level when telling you where someone is.
- grasp of decay: forced corrosion for 20 seconds, can make you vomit. probably shitcode.
- madness touch: give people trauma, braindamage and a terrible mood.
- nightwatcher's rite: fire shotgun that can do 75 damage on point blank
- flesh sickle buffed a bit.
- descriptions touched up a bit.
2020-08-28 16:42:25 -07:00
Lynxless 828a65a7fd New branch test 2020-08-27 15:46:40 -03:00
siliconsandGitHub 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
siliconsandGitHub 7f942abef2 Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
2020-08-23 05:08:14 -07:00
Timothy Teakettle c1a4ad5ea4 non greyscale moths deserve love too 2020-08-22 23:28:03 +01:00
zerothebigboy 21836b4ec8 : ) 2020-08-22 18:11:03 -04:00
timothyteakettle ee9c126d29 moth fluff now shows from behind 2020-08-22 00:18:20 +01:00
timothyteakettle 8370b1f854 moths pls 2020-08-21 23:42:30 +01:00
timothyteakettle a75d91299a yep 2020-08-21 23:16:44 +01:00
Timothy Teakettle cbe9d05fb6 fuck 2020-08-21 21:08:17 +01:00
zerothebigboy b960f4055d a 2020-08-21 01:31:30 -04:00
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
Timothy Teakettle 51503efcd5 removes two dumb sprites 2020-08-16 16:21:53 +01:00
Navier fc70d3dde2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG 2020-08-15 23:13:41 -04:00
LinandGitHub 2fa0b4ae6c Merge pull request #13105 from silicons/underwear_412
ports binder bras from rp
2020-08-14 13:03:25 -05:00
siliconsandGitHub 130c3a9480 Merge pull request #13096 from Michiyamenotehifunana/possum
Ports Opossums from Desert Rose
2020-08-11 16:19:42 -07:00
silicons 6ae11ead4e less terrible 2020-08-11 07:29:15 -07:00
siliconsandGitHub a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
kiwedespars 036c7dbe39 Merge remote-tracking branch 'upstream/master' into heretics 2020-08-10 21:05:56 -07:00
kiwedespars 415e2556f9 descriptions, conflict, and actually puts requirements for the gamemode. 2020-08-10 20:59:51 -07:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
zerothebigboy 3600da46e7 a 2020-08-10 18:25:05 -04:00
zerothebigboy 6e97e82f53 a 2020-08-10 18:09:20 -04:00
zerothebigboy 1a284709cc a 2020-08-10 17:50:44 -04:00
zerothebigboy 40e07849ff a 2020-08-10 17:50:38 -04:00
silicons 375f740d8b sigh 2020-08-10 04:52:33 -07:00
siliconsandGitHub 3795bcf2d0 Merge pull request #13097 from zeroisthebiggay/yessalthairpr
Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because
2020-08-10 02:29:47 -07:00
zerothebigboy 6ddc30c119 a 2020-08-09 08:07:46 -04:00
zerothebigboy 822c17e444 a 2020-08-09 08:07:40 -04:00
Michiyamenotehifunana 9b6156ad81 Ports opposums
Everything stolen from Desert Rose, including sprites. All credits to whoever made it there.
2020-08-09 16:35:12 +08:00
siliconsandGitHub 1586625e6b Merge pull request #12960 from timothyteakettle/loadout-you-say
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
siliconsandGitHub 009f0ebeeb Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
2020-08-06 19:37:30 -07:00
siliconsandGitHub 4720fedce9 Merge pull request #13003 from Hatterhat/crusher-glaive
Proto-Kinetic Glaives - a crusher reskin
2020-08-05 15:25:48 -07:00
Timothy Teakettle 34e2bd626f woops 2020-08-03 14:50:19 +01:00