Commit Graph

  • 2cbb659eb9 Implementing the NO_PUBLIC_LATHE build_type flag. Ghommie 2020-05-03 06:15:40 +02:00
  • b2a20d5438 reducing some prices as training wheel. Ghommie 2020-05-03 05:37:04 +02:00
  • a5c3e3ff2b Oh god please let this be the final boxstation update (#12089) MrJWhit 2020-05-02 21:53:44 -04:00
  • 8f29839dbf Runechat Port (#12065) kevinz000 2020-05-02 18:53:19 -07:00
  • d4e6fada75 Update mirage_border.dm (#12092) kevinz000 2020-05-02 18:50:38 -07:00
  • c1436c4c7b Maptick lag minimization port (#12066) kevinz000 2020-05-02 18:34:33 -07:00
  • 1cb83547fa whops! Ghommie 2020-05-03 03:23:00 +02:00
  • 53c0ea391e steam sales. Ghommie 2020-05-03 02:54:13 +02:00
  • a194d7dafe merge conflict and job/dept discounts support. Ghommie 2020-05-03 02:11:05 +02:00
  • 151ed53cb7 empty commit to reroll bots Detective Google 2020-05-02 18:48:28 -05:00
  • 7b03bbbcb2 whoopps Detective Google 2020-05-02 18:34:31 -05:00
  • 5bf7fd0030 Merge pull request #12087 from Ghommie/Ghommie-cit718 kevinz000 2020-05-02 15:56:28 -07:00
  • 5bf5796fac Merge pull request #12086 from Citadel-Station-13/Ghommie-patch-3 kevinz000 2020-05-02 15:56:22 -07:00
  • b68f1aaf72 Merge pull request #12084 from Ghommie/Ghommie-cit717 kevinz000 2020-05-02 15:55:19 -07:00
  • 3cb4ef24ba Merge pull request #12081 from Ghommie/Ghommie-cit716 kevinz000 2020-05-02 15:55:10 -07:00
  • e9062c5617 Merge pull request #12080 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-05-02 15:54:56 -07:00
  • fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715 kevinz000 2020-05-02 15:54:32 -07:00
  • ae695aeebd Merge pull request #12074 from Sishen1542/bramch kevinz000 2020-05-02 15:54:12 -07:00
  • 5bef1281a4 Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml Detective Google 2020-05-02 17:45:02 -05:00
  • 25d84a6317 brings the engioutpost ruin over as well Detective Google 2020-05-02 17:44:23 -05:00
  • 6db5655ceb Merge branch 'master' into 91-files-changed-fml Detective-Google 2020-05-02 17:16:18 -05:00
  • f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows Lin 2020-05-02 19:13:29 +00:00
  • a5d84b1e80 Merge pull request #11969 from Ghommie/Ghommie-cit698 Lin 2020-05-02 19:09:37 +00:00
  • 592198d659 Makes privates not spew around upon disembowelment or gibbing. Ghommie 2020-05-02 20:01:54 +02:00
  • 42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 Ghommie 2020-05-02 19:17:48 +02:00
  • 7ae2615f51 Whops. Ghommie 2020-05-02 19:13:21 +02:00
  • bdbe6c062e Fixing a cargo exploit Ghom 2020-05-02 19:11:30 +02:00
  • c38c1755cd Done, tested, too many options. Ghommie 2020-05-02 19:05:41 +02:00
  • c1d1e4f0c0 Properly closes some bold tags. (#12088) Putnam3145 2020-05-02 05:53:17 -07:00
  • 65104be982 rad collectors now announce when empty coldud13 2020-05-02 18:55:58 +10:00
  • 2290deb9d7 fixes snowlegion portals dropping proper legions instead of skeles Detective Google 2020-05-01 22:23:19 -05:00
  • 8839e1beaa makes the wendigo screech shake not completely aids Detective Google 2020-05-01 22:02:54 -05:00
  • 7d4e4e24d6 Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work Detective Google 2020-05-01 21:58:32 -05:00
  • 13aa536027 makes the wendigo fight have the same atmos as the surrounding icemoon Detective Google 2020-05-01 20:13:53 -05:00
  • 202b517fa0 Fixing more issues. Ghommie 2020-05-02 02:05:56 +02:00
  • 8bad031979 Update shields.dm Ghom 2020-05-02 01:01:14 +02:00
  • 400e2523c2 paint remover issue webedit. Ghom 2020-05-02 00:55:18 +02:00
  • e7f455e7af makes the uranium mat three times less radioactive Ghom 2020-05-02 00:42:21 +02:00
  • 21c9c98412 > & < agony (#12082) DeltaFire15 2020-05-02 00:36:03 +02:00
  • b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. Ghommie 2020-05-02 00:00:49 +02:00
  • d678970872 Merge pull request #12068 from zeroisthebiggay/fuckshitasstits kevinz000 2020-05-01 14:52:50 -07:00
  • ea831677a1 Merge pull request #11961 from Ghommie/Ghommie-cit697 kevinz000 2020-05-01 14:52:29 -07:00
  • f62aaddb1d Fixing some runtimes with kevinz skills and holodeck hotspots. Ghommie 2020-05-01 23:22:23 +02:00
  • cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 Ghommie 2020-05-01 22:12:00 +02:00
  • 54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 Ghommie 2020-05-01 21:49:52 +02:00
  • 6b4747d5fe Meta station atmos opening up (#12047) MrJWhit 2020-05-01 15:26:36 -04:00
  • f99d904dc7 ports /tg/station vis_flags related fixes (#12064) kevinz000 2020-05-01 12:14:04 -07:00
  • e24f36bc14 bumping up mapmerge requirements.txt Ghom 2020-05-01 21:08:50 +02:00
  • 44f9773ccf Merge pull request #12077 from Ghommie/Ghommie-cit714 kevinz000 2020-05-01 11:50:29 -07:00
  • d85c24680d wendigos can't runtime when butchering if you can't butcher them 😎 Detective Google 2020-05-01 13:22:16 -05:00
  • 52aa8fa1ec leftovers. Ghommie 2020-05-01 19:50:53 +02:00
  • a1f252d558 Fixing several reported issues. Ghommie 2020-05-01 19:48:27 +02:00
  • 5bdafb78c1 Minor updates to pubby for fixing (#12059) MrJWhit 2020-05-01 12:56:40 -04:00
  • 3fc4416680 Buffs medbots massively. (#12058) Putnam3145 2020-05-01 09:50:22 -07:00
  • 030201e5de Two lines (#12071) Psody-Mordheim 2020-05-01 12:42:01 -04:00
  • 836cf17a5b fixes the SM up Detective Google 2020-05-01 11:40:43 -05:00
  • 269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) kevinz000 2020-05-01 09:39:45 -07:00
  • d0a3b86d7b Fix wormholes event flinging people into asteroids. (#11946) BlackMajor 2020-05-02 04:27:39 +12:00
  • 61f6631486 Update engine_sm.dmm (#12062) MrJWhit 2020-05-01 12:26:50 -04:00
  • 8af556e014 backwards couch backwards couch Detective Google 2020-05-01 11:03:15 -05:00
  • 0019b5a742 Game info verb for ghosts (#11935) Putnam3145 2020-05-01 09:02:00 -07:00
  • 16b172c178 Fixes and tweaks for bloodsuckers (#12055) Arturlang 2020-05-01 19:00:15 +03:00
  • 53395171e1 Fixes vendors some (#12056) Arturlang 2020-05-01 18:59:04 +03:00
  • 2335fd3ca6 kay (#12060) kevinz000 2020-05-01 08:57:53 -07:00
  • 3715f95650 Stops organs from turning against you in cold environments and freezers. Ghommie 2020-05-01 16:56:33 +02:00
  • 37d1c469ea hnmhm cultplain?? Sishen 2020-05-01 06:59:54 -06:00
  • 47b97629db Update mobs.dm kevinz000 2020-05-01 04:30:44 -07:00
  • 42762c459e Lets actually use all the positions Psody 2020-05-01 04:14:34 -04:00
  • daff847d93 fixes wendigo cave having no air Detective Google 2020-05-01 01:58:31 -05:00
  • 7ef5246b19 fixes a bunch of mismatch atmos in ruins Detective Google 2020-05-01 01:33:14 -05:00
  • 2832b86e11 some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life Detective Google 2020-05-01 01:17:56 -05:00
  • 231fd0edea fixes the stupid fucking tile placing list Detective Google 2020-04-30 23:04:35 -05:00
  • cf8168a17c fixes kevinz000 2020-04-30 19:26:11 -07:00
  • c911d81cdc fixes the volanic subtypes of the other thing Detective Google 2020-04-30 21:21:59 -05:00
  • eeda86d4a2 Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml Detective Google 2020-04-30 21:18:05 -05:00
  • 6316b02e68 unfucks changeturf for the more_caves Detective Google 2020-04-30 21:17:41 -05:00
  • 8677e3b112 dmm2tgm kevinz000 2020-04-30 19:14:44 -07:00
  • 9c049ef02b more mapping fixes Detective Google 2020-04-30 21:02:31 -05:00
  • e0fe368560 Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml Detective Google 2020-04-30 20:25:54 -05:00
  • d0024575e7 fixes the non matching turf atmos (hopefully) Detective Google 2020-04-30 20:25:51 -05:00
  • 270f5ed168 fix kevinz000 2020-04-30 18:15:43 -07:00
  • c9cd134132 linter fix kevinz000 2020-04-30 17:39:30 -07:00
  • df2b622007 nukes the SpawnTerrain proc used for tg geysers Detective Google 2020-04-30 19:34:27 -05:00
  • 8cd5b4ff4a fixes solars + removes the space tiles in the toxins burn chamber Detective Google 2020-04-30 19:21:53 -05:00
  • c146c898c0 Merge branch 'master' into 91-files-changed-fml Detective-Google 2020-04-30 18:42:38 -05:00
  • 41d1dd1763 fixes the maps Detective Google 2020-04-30 18:13:02 -05:00
  • 2f236ffc04 Merge pull request #12048 from zeroisthebiggay/ilowkeydespiseatmospherics kevinz000 2020-04-30 15:00:36 -07:00
  • 438a83b5c0 a ZeroMan 2020-04-30 17:56:07 -04:00
  • f6736e862d it compiles, now to fix the maps Detective Google 2020-04-30 15:49:06 -05:00
  • d2b7c35ec7 Merge pull request #12057 from MrJWhit/fixes-up-singulo-room kevinz000 2020-04-30 11:13:51 -07:00
  • 52b7086876 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics ZeroMan 2020-04-30 13:48:48 -04:00
  • 7784f5efa1 Merge pull request #12034 from Citadel-Station-13/kevinz000-patch-7 Lin 2020-04-30 17:41:07 +00:00
  • c4250a41d2 Merge pull request #12017 from kevinz000/skills Lin 2020-04-30 17:39:21 +00:00
  • aedecc5f0b Merge pull request #12031 from Trilbyspaceclone/cleanbot kevinz000 2020-04-30 10:37:37 -07:00
  • 061265981d Merge pull request #12052 from deathride58/fixescheetowalkers kevinz000 2020-04-30 10:37:23 -07:00
  • 02265010d6 fixes kevinz000 2020-04-30 10:07:17 -07:00
  • 7e8ebfde83 whew kevinz000 2020-04-30 10:03:35 -07:00
  • 034499f356 new stuff kevinz000 2020-04-30 09:59:08 -07:00
  • 373cafd60b Merge pull request #12063 from Citadel-Station-13/kevinz000-patch-6 Ghom 2020-04-30 18:20:17 +02:00
  • 8dae739d8f fixes kevinz000 2020-04-30 01:39:38 -07:00