Commit Graph
2348 Commits
Author SHA1 Message Date
Chloe Carver-Brown c3ad6b5500 Making silicons their own biotype 2020-12-31 16:45:11 +00:00
ChloeandGitHub 33007f4b9d Merge pull request #3 from quotefox/master
Updating code
2020-12-31 03:34:32 +00:00
QuoteFoxandGitHub 56ed660822 Merge pull request #790 from ArchieBeepBoop/phobia
Hopefully fixes roundtstart phobia?
2020-12-30 07:48:35 +00:00
Archie 4123b5f49f Hopefully fixes phobia? 2020-12-30 03:59:36 -03:00
QuoteFoxandGitHub d3bacb18a9 Merge pull request #788 from ArchieBeepBoop/surgery2
Surgery Fix Pack 1
2020-12-30 03:57:15 +00:00
kevinz000andArchie 10069637a5 Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2020-12-30 00:42:50 -03:00
QuoteFoxandGitHub 99d71b258f Merge pull request #783 from lyricalpaws/master
Adding new smites
2020-12-29 21:25:45 +00:00
QuoteFoxandGitHub 0436e9f141 Merge pull request #786 from ArchieBeepBoop/gamerfood
Balances Gamer Food
2020-12-29 21:24:55 +00:00
QuoteFoxandGitHub cf86a3113a Merge pull request #787 from DragonTrance/cargo-techy-fix
Why do these have QM access again?
2020-12-29 21:24:28 +00:00
QuoteFoxandGitHub 58e7270909 Merge pull request #784 from SandPoot/master
Makes *that pref* more user friendly, nobody cares what a datum is. (PART 2)
2020-12-29 21:23:23 +00:00
DragonTrance 2b1f1c4d22 remove QM access from cargo techs 2020-12-29 12:47:01 -07:00
Archie 38fcb1fa56 Balance gamer food 2020-12-29 16:23:03 -03:00
SandPoot 8609515aa2 upload preferences.dm 2020-12-29 11:44:22 -03:00
Chloe 9538bc4245 adds breadify and nugget smite options 2020-12-29 12:27:34 +00:00
ChloeandGitHub ba8fd939a4 Merge pull request #2 from quotefox/master
update lol
2020-12-28 23:08:22 +00:00
QuoteFox 205879e74e Radio sounds on send
Radio sounds on send
2020-12-28 21:14:23 +00:00
QuoteFoxandGitHub 3a59ef3d3d Merge pull request #776 from ArchieBeepBoop/Surgery
Massively Rage Ports Surgery Updates
2020-12-28 19:55:35 +00:00
Archie d241229ba0 Merge remote-tracking branch 'upstream/master' into Surgery 2020-12-28 16:43:57 -03:00
QuoteFoxandGitHub 9c2c2a22e2 Merge pull request #773 from DragonTrance/deconstructing
Adds the Ability to deconstruct various objects
2020-12-28 19:34:37 +00:00
QuoteFoxandGitHub a7ee147981 Merge pull request #780 from DragonTrance/drink-throwing
another thing
2020-12-28 19:33:42 +00:00
QuoteFoxandGitHub 4ea8b7bfcb Merge pull request #781 from TotallyNotADog/fixPrussian
fixes prussian blue
2020-12-28 19:33:23 +00:00
QuoteFoxandGitHub c7b17adb55 Merge pull request #782 from SandPoot/master
Makes *that pref* more user friendly, nobody cares what a datum is.
2020-12-28 19:33:06 +00:00
SandPoot 2622806ac2 don't 2020-12-28 15:50:14 -03:00
SandPoot 5684a36443 push files. 2020-12-28 15:49:19 -03:00
TotallyNotADog 06155664dd fixes prussian blue 2020-12-27 19:52:54 -06:00
DragonTrance 18fdedf6ab fixed sound not playing 2020-12-27 15:40:45 -07:00
QuoteFoxandGitHub 64b9c9f317 Merge pull request #778 from ArchieBeepBoop/cloning1
Ports "Nerfs Cloning" by Silicons
2020-12-27 19:22:12 +00:00
QuoteFoxandGitHub 4e87dc783b Merge pull request #779 from DragonTrance/drink-throwing
Bartender's Drink Flinging fix
2020-12-27 19:21:28 +00:00
DragonTrance e57ba1502e tiny bit of cleanup 2020-12-27 12:19:54 -07:00
DragonTrance 76b0b45a0b drink flinging fix
finally
2020-12-27 12:12:41 -07:00
QuoteFox 8b9f6b1a1b Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2020-12-27 09:48:51 +00:00
QuoteFox f73a8f7f24 Revert "DNC is now worth no points."
This reverts commit cb0d36aaf3.
2020-12-27 09:48:48 +00:00
GhomandArchie 8b918b1d82 Merge pull request #10630 from Citadel-Station-13/kevinz000-patch-17
Nerfs cloning
2020-12-27 06:42:41 -03:00
QuoteFoxandGitHub d940287569 Merge pull request #777 from ArchieBeepBoop/drakeborg
Removes Drakeborgs
2020-12-27 08:59:00 +00:00
siliconsandArchie 16cc9e35f7 Removes Drakeborgs 2020-12-27 05:55:38 -03:00
Archie 188cc10974 Merge remote-tracking branch 'upstream/master' into Surgery 2020-12-27 04:29:21 -03:00
GhomandArchie 482ba4a8ee Merge pull request #10806 from Feasel/master
[Balance Patch - Tend Wounds Edition]
2020-12-27 04:27:52 -03:00
kevinz000andArchie c27dbcaf5f Merge pull request #9522 from Linzolle/tend-wounds
Tend Wounds + Make Revival more accessible
2020-12-27 04:27:29 -03:00
Archie 5710e12cb5 Surgery ports 1 2020-12-27 04:25:28 -03:00
QuoteFoxandGitHub aa58dec5f4 Merge pull request #771 from ArchieBeepBoop/blood2
Pooj Blood Code Cleanup
2020-12-27 07:10:40 +00:00
QuoteFoxandGitHub 3a2d7212df Merge pull request #775 from ArchieBeepBoop/reagentfix2
More Reagents fixed
2020-12-27 07:10:09 +00:00
QuoteFox cb0d36aaf3 DNC is now worth no points.
DNC is now worth no points, having a DNC and used to give you 2 whole points, making it harder for medical seems abit outragous, If you want the roleplay or challange, you shouldnt be rewarded for wasting peoples time and then raging in dead chat about medical staff not knowing how to fix people.
2020-12-27 05:55:37 +00:00
Archie 7c549e6b1e more reagents 2020-12-27 01:42:51 -03:00
QuoteFoxandGitHub f390fbc8b5 Merge pull request #774 from quotefox/heat
Heat and Detect Heat Lewd Traits
2020-12-26 22:21:25 +00:00
QuoteFoxandGitHub b3aecde046 Merge pull request #765 from DragonTrance/corpseflower
Corpse Flower
2020-12-26 21:50:41 +00:00
QuoteFox 36708431a4 grammer grammer fix
grammer grammer fix
2020-12-26 21:45:35 +00:00
QuoteFox 3f1d6277c2 typo fix
typo fix
2020-12-26 21:41:03 +00:00
QuoteFox 3588d4044c Heat Traits
For fun and for anyone wanting to do their heat/breeding fetish. Opt-in required.
2020-12-26 20:57:09 +00:00
QuoteFox 48076fbfd3 patreon rewards
natak, demoncat
2020-12-26 19:11:03 +00:00
DragonTranceandGitHub 9068e9c580 Update loom.dm 2020-12-25 14:14:52 -07:00