Commit Graph
2453 Commits
Author SHA1 Message Date
kevinz000andGitHub a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements
Vore fixes and optimizations
2019-10-17 12:48:01 -07:00
kevinz000andGitHub 994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
2019-10-16 12:44:34 -07:00
kevinz000andGitHub 7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
kevinz000andGitHub 6d1035e995 Merge pull request #9491 from Poojawa/wingfix
Fixes missing decorative wing states
2019-10-15 22:59:45 -07:00
Poojawa 2f9771b1a9 Maybe it's really just as simple as... 2019-10-16 00:48:38 -05:00
Poojawa 1780f1addd animal nom still don't work but runtimes are fixed
whatever
2019-10-15 12:11:46 -05:00
Poojawa 4396bd4280 runtime fixings I guess 2019-10-15 07:08:00 -05:00
Poojawa 9308ee517f fixing some belly mode quirks 2019-10-15 06:49:31 -05:00
deathride58andGitHub df17f34eb6 Merge pull request #9488 from Ghommie/Ghommie-cit231
Adds some missing species_traits for cloth, clockwork and cult golems.
2019-10-15 06:20:43 -04:00
deathride58andGitHub ffa7898f45 Merge pull request #9478 from Putnam3145/podfatfix
Makes pod people not constantly slightly fat
2019-10-15 06:19:26 -04:00
Poojawa d5d878e93e moved the values up 2019-10-15 04:09:46 -05:00
Poojawa ff21b992ad Move files and tweaks vore panel stuff 2019-10-15 03:35:00 -05:00
deathride58andGitHub 6245d5df30 Merge pull request #9471 from Citadel-Station-13/exploits
[s] fixes some exploits
2019-10-14 14:16:46 -04:00
FermiandFermi 7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Poojawa 198f2b7add Fixes missing decorative wing states 2019-10-13 19:02:28 -05:00
Thalpy e7c5e74d3a Hopefully no break 2019-10-13 23:41:06 +01:00
Ghommie ff3972247a Fixes some missing species_traits for cloth, clockwork and cult golems. 2019-10-13 23:40:52 +02:00
kevinz000andGitHub 48e4187cef Merge pull request #9461 from r4d6/master
Adding Decorative Wings
2019-10-13 14:00:07 -07:00
Putnam 1b97c50ef7 Makes pod people not constantly slightly fat 2019-10-12 17:50:51 -07:00
kevinz000andGitHub 076b2d48fc Update secbot.dm 2019-10-11 20:46:19 -07:00
kevinz000andGitHub 8c07a79700 Update bot.dm 2019-10-11 20:45:42 -07:00
FermiandFermi 7bce68bb11 Merge branch 'master' into Spookytime 2019-10-11 21:51:48 +01:00
kevinz000andGitHub e717272129 Merge pull request #9450 from JTGSZ/offsets4stuff
Adds more control over species based offsets
2019-10-11 12:13:19 -07:00
kevinz000andGitHub 0643a7b230 Merge pull request #9387 from Sishen1542/goose
the geese have been unleased
2019-10-11 12:11:50 -07:00
kevinz000andGitHub b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2019-10-11 12:10:31 -07:00
kevinz000andGitHub 9cd75c82a4 Merge pull request #9435 from Linzolle/firefix
fix fireman carry offhand not automatically deleting itself
2019-10-11 12:09:14 -07:00
kevinz000andGitHub 4ab08802a1 Merge pull request #9442 from YakumoChen/air-hog
Reverts jetpack efficiency from #9307
2019-10-11 12:08:44 -07:00
kevinz000andGitHub 1896b43c79 Merge pull request #9451 from Ghommie/Ghommie-cit224
standarizes mobs' can_equip arguments.
2019-10-11 12:05:12 -07:00
FermiandFermi cd47412db2 Merge branch 'master' into Spookytime 2019-10-11 19:10:48 +01:00
Sishen c51bfc153b b 2019-10-11 13:24:00 -04:00
YakumoChenandGitHub 55e7645773 updating branch 2019-10-11 04:55:57 -04:00
6b2a68f77a Update code/modules/mob/living/carbon/human/species_types/furrypeople.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-10-10 21:09:28 -04:00
r4d6andGitHub 0d5770f986 Update species.dm 2019-10-10 20:32:12 -04:00
r4d6andGitHub e83460853c Update furrypeople.dm 2019-10-10 20:32:09 -04:00
kevinz000andGitHub 3e6415d4b5 Merge pull request #9324 from Linzolle/crusher
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
2019-10-10 02:23:15 -07:00
kevinz000andGitHub f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45
Virtual reality componentization.
2019-10-10 02:09:51 -07:00
kevinz000andGitHub 0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2019-10-10 02:09:37 -07:00
FermiandFermi c4ac815598 Oof 2019-10-09 16:35:20 +01:00
FermiandFermi b34f648e60 Adds landmarks. 2019-10-09 13:57:19 +01:00
Ghommie 735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
Ghommie 9c3e532be7 Fixes lack of arguments on mobs' can_equip. 2019-10-09 00:21:55 +02:00
JTGSZ 2cd7f8f8ce More control over species based offsets 2019-10-08 17:03:51 -04:00
YakumoChenandGitHub 6faa0ee6e9 reverts jetpack efficiency 2019-10-08 09:03:12 +00:00
lolman360 04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
kevinz000andGitHub abef83f56e Merge pull request #9427 from Ghommie/Ghommie-cit219
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
2019-10-08 00:34:33 -07:00
kevinz000andGitHub 8aacedaefa Merge pull request #9316 from Thalpy/Reagents_bitflats
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
2019-10-08 00:33:21 -07:00
kevinz000andGitHub 06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178
Ports plasmaman departmental envirosuits and tweaks.
2019-10-08 00:28:06 -07:00
kevinz000andGitHub dcb37bfd0e Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
ThalpyandGitHub 564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
kevinz000andGitHub 0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00