100 Commits
Author SHA1 Message Date
Archie 4ce4e88398 Fixes some shit 2021-01-14 14:59:03 -03:00
kevinz000andArchie b5fe141a49 Supply Pod Code Update 2021-01-14 14:31:35 -03:00
Archie 7d19680fc3 remove log, typo 2021-01-12 22:57:53 -03:00
Archie ebee3bae26 The boom mouse beckons 2021-01-12 22:56:17 -03:00
Archie c164b52b30 Merge remote-tracking branch 'upstream/master' into nexties2 2021-01-08 15:20:47 -03:00
Archie 78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
kevinz000andArchie 939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
BlackMajorandArchie 02cb328921 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2021-01-05 16:58:19 -03:00
Putnam3145andArchie 0db5aed986 Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2021-01-05 16:51:22 -03:00
Archie 9e37d3be62 Fix merge conflicts 2021-01-05 03:41:08 -03:00
LinandArchie b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
GhomandArchie 291dcf9515 Merge pull request #10575 from Arturlang/TGUIs_Nexties
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
kevinz000andArchie 12c8ebea11 Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite. 2021-01-03 05:21:47 -03:00
kevinz000andArchie ee082f200e Fermi1 2021-01-03 05:00:57 -03: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 7fb3ed17f7 Merge pull request #755 from ArchieBeepBoop/reagentsagain
Ports reagents id removal and typepath usage
2020-12-23 17:48:37 +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
LinandArchie a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
DahlularandGitHub 3800442a32 Merge pull request #727 from ArchieBeepBoop/reagents
Ports "Refactors can_see_reagents"
2020-12-06 13:31:50 -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 ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
DahlularandGitHub 59abd14af6 Merge pull request #705 from ArchieBeepBoop/medbotfixing
Medbots are FINALLY smarter and will no longer outright kill slimes
2020-11-21 23:04:16 -07:00
Dip 4a09ed3822 Medbots are now smarter 2020-11-21 03:24:51 -03:00
kevinz000andDip c7db7cb2be The ID Code Cleanup and Fixening (tm) 2020-11-20 20:55:27 -03:00
kevinz000andDip 4bd370532d Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2020-11-12 03:53:27 -03:00
Dip 3f5d4fe6d5 Right 2020-11-09 00:23:07 -03:00
Dip 5ab0752975 Prevents slimes from attacking other slimes + Fixes invincible runtime 2020-11-09 00:04:53 -03:00
Dip 1ef899440b yeah also this 2020-11-04 17:12:18 -03:00
Dip a8e8f24032 refactor 2020-11-01 20:08:54 -03:00
Dip 6db43927c6 HAHA YEAH NO 2020-11-01 19:12:21 -03:00
Dip c7c6b579d8 anotherone 2020-11-01 19:10:07 -03:00
GhomandDip 28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
Dip 4d64275e84 HARD return 2020-10-30 00:04:59 -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
Dip a6ce59ec67 floor cluwne fix 2020-10-25 02:07:55 -03:00
DahlularandGitHub 3be0cb650a Merge pull request #607 from ArchieBeepBoop/becomemodular
Oh boy, it's another one of Archie's mini packs. - Energy Harvester, HoS Pet Port and a micro carp buff.
2020-10-23 16:25:53 -06:00
Dip 61fad3f3de debuff carps, dormammu has not accepted bargain 2020-10-23 19:18:03 -03:00
Dip ddcf4e1434 Adds petting element to Lia and Cayenne, alongside mob holder. 2020-10-20 03:14:45 -03:00
Dip 9d8a729c51 Ports Lia / Micro Carp Buff? 2020-10-20 02:46:13 -03:00
Dip 6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00
kevinz000andDip 2e75188a0b Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
2020-10-18 00:03:22 -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 1c151faf05 Merge pull request #590 from ArchieBeepBoop/radiationfixes
Radiation runtime fix, collector balance tweak, Machinery Alt Click, jukeboxes finally work, turrets no longer target megafauna, etc
2020-10-16 12:32:49 +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
Dip f0bf81cb1f Runtimes and balance 2020-10-13 06:10:12 -03:00
Dip 2381dd7504 belt + typo fix 2020-10-10 17:42:10 -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
DahlularandGitHub 107d47a1e8 Merge pull request #560 from ArchieBeepBoop/examinerefactor
Examine Code Refactor
2020-10-06 21:02:05 -06:00