185 Commits
Author SHA1 Message Date
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
QuoteFoxandGitHub 2a1761e8ad Merge pull request #763 from ArchieBeepBoop/fixes-the-bugs
Fixing some annoying bugs.
2020-12-22 00:52:55 +00:00
LinandArchie b9fe810525 Merge pull request #9959 from Ghommie/Ghommie-cit397
patching some combat mode edge cases and issues.
2020-12-20 11:32:28 -03:00
Archie 3c940086be v1 2020-12-09 20:14:12 -03:00
DahlularandGitHub 4fb6256a99 Revert "Borg expander + VTEC fix" 2020-12-06 13:44:28 -07:00
DahlularandGitHub 3800442a32 Merge pull request #727 from ArchieBeepBoop/reagents
Ports "Refactors can_see_reagents"
2020-12-06 13:31:50 -07:00
DahlularandGitHub 40b1495ff3 Merge pull request #714 from DragonTrance/borgupgrade-fix
Borg expander + VTEC fix
2020-12-06 13:22:11 -07:00
LinandDip 9677bb5104 Merge pull request #10242 from Ghommie/Ghommie-cit483
Ports "Refactors can_see_reagents"
2020-12-02 00:57:14 -03:00
CygnusB 8c56e05f91 Update status_effects.dm 2020-12-01 22:29:20 -03:00
CygnusB e1c8ee5cd8 Update traits.dm 2020-12-01 19:02:32 -03:00
CygnusB ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
DragonTranceandGitHub 3042f9df69 i am literally hand-writing these on my phone from my computer because of my lack of internet 2020-11-22 14:06:52 -07:00
DahlularandGitHub fa5e05c44c Merge pull request #702 from ArchieBeepBoop/idbullshitpart3
Cleaning up ID Console code and other tweaks - The "I want to die" edition
2020-11-21 23:00:50 -07:00
DahlularandGitHub 6645e50dad Merge pull request #694 from ArchieBeepBoop/improvements
ATMOS Firelocks and more
2020-11-21 22:54:02 -07:00
kevinz000andDip c7db7cb2be The ID Code Cleanup and Fixening (tm) 2020-11-20 20:55:27 -03:00
DahlularandGitHub 79d678fe19 Merge pull request #678 from ArchieBeepBoop/teleportfixes
[Testmerge] Mass fixing Teleporter issues + Implant Location Refactoring and Fixes
2020-11-19 23:18:37 -07:00
GhomandDip 7a8fcf77d4 ATMOS Firelocks and more 2020-11-19 11:04:04 -03:00
kevinz000andDip f85a275834 Merge pull request #9510 from Ghommie/Ghommie-cit240
Fixing tracking implant teleport issues.
2020-11-12 03:58:15 -03:00
Dip 2b6448cab4 Makes radiation resonance less undesirable. 2020-11-12 02:29:42 -03:00
QuoteFoxandGitHub 1b3d33388a Merge pull request #671 from ArchieBeepBoop/indicators
Typing Indicators
2020-11-10 16:58:24 +00:00
DahlularandGitHub b25faa3d24 Merge pull request #656 from Jay-Sparrow/Head-restrtict
Junior roles
2020-11-10 01:56:36 -07:00
Dip 6eebc1d649 Typing Indicators 2020-11-10 01:52:06 -03:00
JaySparrow ea5b9ca4ef Junior roles
And more! Oof ouch my soul.
2020-11-04 00:37:23 -06:00
kevinz000andDip 752a3d9bcc Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-03 01:51:18 -03:00
GhomandDip 28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
kevinz000andDip b0a2ebdf3e Merge pull request #9960 from Ghommie/Ghommie-cit398
Ports custom reagent icecreams.
2020-10-30 04:27:59 -03:00
DahlularandGitHub ee0017721e Merge pull request #627 from ArchieBeepBoop/spooky
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
2020-10-29 22:51:07 -06:00
Dip 9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
DahlularandGitHub bbbd52a4a4 Merge pull request #623 from ArchieBeepBoop/numbertwo
Ports: GetComponent macros removal, and few other updates.
2020-10-29 10:30:33 -06:00
Dip 138b7a0aa0 this dullahan bullshit is going to make me kill myself 2020-10-28 16:29:53 -03:00
kevinz000andDip 731b38c975 Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
2020-10-28 16:25:19 -03:00
kevinz000andDip 45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
kevinz000andDip f1f89cbb50 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
The art of drunken captaining
2020-10-28 05:12:18 -03:00
kevinz000andDip 2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
kevinz000andDip 7034e00e1c Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
The art of drunken captaining
2020-10-27 13:28:17 -03:00
Dip c91a106b0d fixes and runtimes 2020-10-17 23:55:40 -03:00
Dip 682eb7b9b6 gotta make sure this works yo 2020-10-17 22:25:29 -03:00
deathride58andDip cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
QuoteFoxandGitHub 5ceb438065 Merge pull request #592 from ArchieBeepBoop/pipes
Port TG Pipe Layers updates, Freezer Layer Update and RPD icon reorder
2020-10-16 12:32:05 +01:00
kevinz000andDip c952c3ecff Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112)
* Misstake are now

* Still dosnt all work

* no more range upgrade it just dosnt work

* bithell

* a this
2020-10-15 01:56:47 -03:00
kevinz000andArchie f6c62c57ba Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
2020-10-14 02:34:25 -03:00
GhomandDip 779cc787a3 Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL
2020-10-07 18:40:10 -03:00
Dip 52eaf9ed92 BOY 2020-10-05 11:07:52 -03:00
QuoteFox 631090cf04 Dynamic glidespeed
ported from yogstation
2020-10-05 03:58:10 +01:00
QuoteFoxandGitHub 5e298aac96 Merge pull request #549 from ArchieBeepBoop/moveforce
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-05 02:59:39 +01:00
DahlularandGitHub 5516a724ef Merge pull request #546 from ArchieBeepBoop/cluwnenew
Floor Cluwne Forced Targeting / Cluwne Smite
2020-10-04 03:12:19 -06:00
kevinz000andDip b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
Dip 7fe8270f17 cluwnefix 2020-10-03 02:00:33 -03:00
kevinz000andDip f318dbe1b2 Merge pull request #10881 from Ghommie/Ghommie-cit552 2020-10-02 02:14:44 -03:00
kevinz000andDip 014bc3e026 Merge pull request #10046 from Ghommie/Ghommie-cit424
Ports flag for bespoke elements.
2020-10-02 00:51:46 -03:00