Commit Graph
1800 Commits
Author SHA1 Message Date
GhomandGitHub 107a6434fd Merge pull request #11305 from Citadel-Station-13/kevinz000-patch-23
you can no longer stamcrit a goddamn xenomorph come on citadel why is this a thing
2020-03-03 13:36:52 +01:00
GhomandGitHub 81bb6978de Merge pull request #11250 from Seris02/risingbassnerf
Rising bass nerfs and fixes
2020-03-03 13:26:19 +01:00
GhomandGitHub 6da3cf3bbb Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1
fix flypeople nutrition
2020-03-03 13:24:32 +01:00
Seris02 8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000andGitHub c3913a793a Update carbon_movement.dm 2020-03-03 03:02:16 -07:00
LinandGitHub fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596
An old oversight with disease/var/viable_mobtypes.
2020-03-02 18:31:25 -06:00
kevinz000andGitHub 6c8154e8e1 Update damage_procs.dm 2020-03-02 12:13:36 -07:00
kevinz000andGitHub 1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
LinandGitHub bb05b47ead fix flypeople nutrition 2020-03-01 23:35:16 +00:00
Ghommie c0ff43f827 ofc, New arguments. 2020-03-01 16:34:43 +01:00
monster860andGitHub 899f1bbd88 Allow moaning while in soft crit 2020-02-29 21:02:37 -05:00
Seris02 de6e8012f3 balances yee 2020-02-26 17:49:37 +08:00
Ghommie e02a6f6dea Fixing virology cause someone didn't covert ALL mob/species biotypes to flags. 2020-02-25 15:37:02 +01:00
kevinz000andGitHub 4fc0ef5e74 Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N
Makes all IPC organs look robotic!
2020-02-24 02:24:06 -07:00
GhomandGitHub b7fab93209 Merge pull request #11186 from Putnam3145/fixed-flavor
Fixed temp flavor text (for real)
2020-02-22 15:09:58 +01:00
Putnam d328d554ba Reduced copypasta 2020-02-22 02:38:57 -08:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Putnam 146b2a35f2 fixed temp flavor text (for real) 2020-02-21 00:26:42 -08:00
TrilbySpaceClone 7d8f1320b3 it looks nicer 2020-02-21 03:07:42 -05:00
GhomandGitHub 4649183a47 Merge pull request #11154 from Kraseo/fuck-nightmares
Fixes nightmares deleting guns with flashlights
2020-02-20 20:52:29 +01:00
kevinz000andGitHub ca777c6c8b Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
2020-02-20 06:17:33 -07:00
GhomandGitHub d680ab9fd5 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
2020-02-20 11:27:48 +01:00
kevinz000andGitHub 9589c3116b Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
2020-02-19 19:03:01 -07:00
kevinz000andGitHub b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586
Something about pAIs and silicon access priviledges.
2020-02-19 18:59:10 -07:00
Kraseo cd56e29a98 drink my ass kevinz 2020-02-20 00:18:43 +01:00
ArturlangandGitHub 796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
Kraseo f532c1a444 i spent 2 hours figuring out how to fix this 2020-02-19 18:40:30 +01:00
Ghommie 057b6f591c HEEY 2020-02-19 14:23:12 +01:00
Ghommie 37ba75ec12 Fixing addiction moodlets not going away and secret sauce recipe paper. 2020-02-19 14:07:11 +01:00
GhomandGitHub 08c86ec1ea Merge pull request #11091 from BlueWildrose/master
Podpeople species tail wag fix; also lifebringer name fix
2020-02-18 17:11:50 +01:00
Ghommie 698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
kevinz000andGitHub d04126226b Merge pull request #11082 from Hatterhat/preservahyde
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
2020-02-18 02:21:37 -07:00
BlueWildroseandGitHub 78fcd706b3 Requested changes, podpeople.dm 2020-02-17 19:41:30 -07:00
LinandGitHub a37e1ab129 Merge pull request #11093 from Ghommie/Ghommie-cit580
Something about blood and species handle_chemicals()
2020-02-16 12:36:41 -06:00
Ghommie 23ae9996d2 Something more about runtime errors. 2020-02-16 15:24:15 +01:00
TrilbySpaceClone cba6667332 it could work 2020-02-15 18:42:50 -05:00
kevinz000andGitHub b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560
First tweak to cargo reagents selling.
2020-02-15 12:15:50 -07:00
kevinz000andGitHub 6e2e7e29d1 Merge pull request #11072 from Ghommie/Ghommie-cit576
Doubled halved flavor text max length and removed crappy code.
2020-02-15 11:46:00 -07:00
Ghommie 4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
GhomandGitHub 8934f9b401 Update flypeople.dm 2020-02-14 17:24:50 +01:00
Blue Wildrose d45a20c19b Podpeople tweaks
- Podpeople can wag tails now
- Moved a few features into the podperson race itself instead of its weaker, roundstart variant; this in theory, will allow pod-grown hydroponics podpeople to have hair now, as well as all those anthropomorphic features, should they be revived through this method.
- Fixed the lifebringers having no name somehow but... currently lifebringers under this change will turn them into animal anthropomorphic hairy mutants of some kind until I figure out how to make them the bald podpeople that they once were, could use some help with this.
2020-02-14 05:12:50 -07:00
Ghommie 0f5952fff7 Something about blood and species. 2020-02-14 09:48:10 +01:00
Hatterhat 1276453dc4 initial commit - preservahyde 2020-02-13 21:01:28 -06:00
Artur 7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Artur c01f78b8e8 Conflict fix 2020-02-13 17:52:28 +02:00
Ghommie 315b0a9645 Fixes halved flavor text max length and removing some crappy code. 2020-02-13 14:05:40 +01:00
kevinz000andGitHub c790478a3d Merge pull request #11012 from keronshb/RatvarDrink
Introduces the Ratvarian mixed drink, the CogChamp!
2020-02-12 23:58:14 -07:00
Artur a9a167b9d3 Suffering and co 2020-02-11 20:18:32 +02:00
keronshb 42fda3d88b CogChamp
Adds the CogChamp drink!  Bloodcult gets one so why not Clock?
2020-02-10 21:18:51 -05:00
GhomandGitHub c8a62e7acf Merge pull request #10985 from r4d6/Dwarf
Dwarven Update
2020-02-10 12:23:23 +01:00