Commit Graph

24553 Commits

Author SHA1 Message Date
Detective Google e197513bcc fixes lone ops and ninjas 2020-05-03 01:22:18 -05:00
Detective Google bad9e76e50 Fixes pirates, ops, the mining base, and gives pirates and ops drills 2020-05-03 00:28:28 -05:00
Ghom 161da560b6 Update autolathe.dm 2020-05-03 07:17:18 +02:00
Ghommie 76e1ee80b7 Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them" 2020-05-03 07:12:41 +02:00
Ghommie 843f43b4ad Some autolathe issue. 2020-05-03 06:27:38 +02:00
Ghommie 2cbb659eb9 Implementing the NO_PUBLIC_LATHE build_type flag. 2020-05-03 06:15:40 +02:00
Ghommie b2a20d5438 reducing some prices as training wheel. 2020-05-03 05:37:04 +02:00
kevinz000 8f29839dbf Runechat Port (#12065)
* A

* A

* Ports Runechat

* compile fix

* fuck

* maybe?

* will this work?

* PLEASE

* fix

* fuck this
2020-05-03 03:53:19 +02:00
kevinz000 d4e6fada75 Update mirage_border.dm (#12092) 2020-05-03 03:50:38 +02:00
kevinz000 c1436c4c7b Maptick lag minimization port (#12066)
* extools.dll

* backend

* queued pipenet builds

* oh yeah we don't have that

* wow

* Update air.dm
2020-05-03 03:34:33 +02:00
Ghommie 1cb83547fa whops! 2020-05-03 03:23:00 +02:00
Ghommie 53c0ea391e steam sales. 2020-05-03 02:54:13 +02:00
Ghommie a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
kevinz000 5bf7fd0030 Merge pull request #12087 from Ghommie/Ghommie-cit718
Fixing more issues.
2020-05-02 15:56:28 -07:00
kevinz000 5bf5796fac Merge pull request #12086 from Citadel-Station-13/Ghommie-patch-3
Webedit bugfixes
2020-05-02 15:56:22 -07:00
kevinz000 b68f1aaf72 Merge pull request #12084 from Ghommie/Ghommie-cit717
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
2020-05-02 15:55:19 -07:00
kevinz000 3cb4ef24ba Merge pull request #12081 from Ghommie/Ghommie-cit716
Fixing some runtimes with kevinz skills and holodeck hotspots.
2020-05-02 15:55:10 -07:00
kevinz000 fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715
Fixing several reported issues.
2020-05-02 15:54:32 -07:00
kevinz000 ae695aeebd Merge pull request #12074 from Sishen1542/bramch
makes traitor chap cult items minimum 20 pop
2020-05-02 15:54:12 -07:00
Detective Google 5bef1281a4 Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml 2020-05-02 17:45:02 -05:00
Detective Google 25d84a6317 brings the engioutpost ruin over as well 2020-05-02 17:44:23 -05:00
Detective-Google 6db5655ceb Merge branch 'master' into 91-files-changed-fml 2020-05-02 17:16:18 -05:00
Lin f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows
Electrochromatic (dim-on-demand) windows
2020-05-02 19:13:29 +00:00
Ghommie 592198d659 Makes privates not spew around upon disembowelment or gibbing. 2020-05-02 20:01:54 +02:00
Ghommie 42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
Ghommie 7ae2615f51 Whops. 2020-05-02 19:13:21 +02:00
Ghom bdbe6c062e Fixing a cargo exploit 2020-05-02 19:11:30 +02:00
Ghommie c38c1755cd Done, tested, too many options. 2020-05-02 19:05:41 +02:00
Putnam3145 c1d1e4f0c0 Properly closes some bold tags. (#12088)
* Fixes some unmatched <b>s

* remember to ctrl+s
2020-05-02 14:53:17 +02:00
coldud13 65104be982 rad collectors now announce when empty 2020-05-02 18:55:58 +10:00
Detective Google 2290deb9d7 fixes snowlegion portals dropping proper legions instead of skeles 2020-05-01 22:23:19 -05:00
Detective Google 8839e1beaa makes the wendigo screech shake not completely aids 2020-05-01 22:02:54 -05:00
Detective Google 7d4e4e24d6 Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work 2020-05-01 21:58:32 -05:00
Detective Google 13aa536027 makes the wendigo fight have the same atmos as the surrounding icemoon 2020-05-01 20:13:53 -05:00
Ghommie 202b517fa0 Fixing more issues. 2020-05-02 02:05:56 +02:00
Ghom 8bad031979 Update shields.dm 2020-05-02 01:01:14 +02:00
Ghom 400e2523c2 paint remover issue webedit. 2020-05-02 00:55:18 +02:00
Ghom e7f455e7af makes the uranium mat three times less radioactive 2020-05-02 00:42:21 +02:00
DeltaFire15 21c9c98412 > & < agony (#12082)
hm yes today a check being the wrong way will break exo nanites.
2020-05-02 00:36:03 +02:00
Ghommie b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02:00
kevinz000 d678970872 Merge pull request #12068 from zeroisthebiggay/fuckshitasstits
quick hosion mode buff
2020-05-01 14:52:50 -07:00
kevinz000 ea831677a1 Merge pull request #11961 from Ghommie/Ghommie-cit697
toylathe copypasta removal and preparations for economy public lathe nerf.
2020-05-01 14:52:29 -07:00
Ghommie f62aaddb1d Fixing some runtimes with kevinz skills and holodeck hotspots. 2020-05-01 23:22:23 +02:00
Ghommie cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-01 22:12:00 +02:00
Ghommie 54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
kevinz000 f99d904dc7 ports /tg/station vis_flags related fixes (#12064)
* fixes

* Update layers_planes.dm

* kay
2020-05-01 21:14:04 +02:00
kevinz000 44f9773ccf Merge pull request #12077 from Ghommie/Ghommie-cit714
Stops organs from turning against owners in cold environments and freezers.
2020-05-01 11:50:29 -07:00
Detective Google d85c24680d wendigos can't runtime when butchering if you can't butcher them 😎 2020-05-01 13:22:16 -05:00
Ghommie a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +02:00
Putnam3145 3fc4416680 Buffs medbots massively. (#12058)
* Buffs medbots massively.

* Reverted the previous buff slightly.

* Update code/modules/mob/living/simple_animal/bot/medbot.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-01 18:50:22 +02:00