Commit Graph

  • 6763324506 Fixes the BDM's proc loop (Ported from TG) WanderingFox95 2021-10-13 21:47:24 +02:00
  • a2b42d1b69 Merge branch 'Citadel-Station-13:master' into master WanderingFox95 2021-10-13 21:37:14 +02:00
  • f03b83e89b Update server.txt SandPoot 2021-10-13 15:12:52 -03:00
  • 5153dba0f2 Upload files SandPoot 2021-10-13 15:11:25 -03:00
  • 608b6fbb1b Upload files SandPoot 2021-10-12 22:17:43 -03:00
  • 7dd50272e2 Automatic changelog compile [ci skip] Changelogs 2021-10-13 00:26:56 +00:00
  • e07d39bb8b Fix atom hud keronshb 2021-10-12 17:27:22 -04:00
  • e2ab532de2 Removes old gangs, families is almost ready keronshb 2021-10-12 16:34:27 -04:00
  • bd7a2b6a2a Lets families compile keronshb 2021-10-12 16:12:38 -04:00
  • d88933b492 Families wanted stars now only show up when you are involved in it, and announcements for wanted level changes (#50283) keronshb 2021-10-12 14:03:33 -04:00
  • 41013ec815 Part 2 - Missing stuff from original families port keronshb 2021-10-12 12:07:02 -04:00
  • ac67c4e75c Automatic changelog generation for PR #15261 [ci skip] CitadelStationBot 2021-10-12 01:56:59 -05:00
  • 4be484f101 Merge pull request #15261 from MrJWhit/delta Lin 2021-10-11 23:56:57 -07:00
  • 812a144db2 Automatic changelog generation for PR #15260 [ci skip] CitadelStationBot 2021-10-12 01:49:58 -05:00
  • fcd488b522 Merge pull request #15260 from MrJWhit/boxstation-stuff Lin 2021-10-11 23:49:55 -07:00
  • f623d6e7eb Merge pull request #15229 from Hatterhat/perhaps-i-was-a-bit-too-harsh silicons 2021-10-11 20:46:06 -07:00
  • 789bbbdeb0 Automatic changelog generation for PR #15223 [ci skip] CitadelStationBot 2021-10-11 22:45:45 -05:00
  • 91e7cb293c Merge pull request #15223 from Hatterhat/yeehaw-box silicons 2021-10-11 20:45:42 -07:00
  • 0bae06adcd Original Port keronshb 2021-10-11 22:00:54 -04:00
  • 408317fae0 Merge remote-tracking branch 'upstream/master' keronshb 2021-10-11 20:28:24 -04:00
  • 829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not SandPoot 2021-10-11 20:41:56 -03:00
  • b6fdf671f1 Merge pull request #15215 from silicons/afk_tracking Putnam3145 2021-10-11 15:52:03 -07:00
  • 3209917830 Merge pull request #15173 from silicons/vpn_block Putnam3145 2021-10-11 15:51:52 -07:00
  • 83ebebaa05 Merge pull request #14890 from Citadel-Station-13/silicons-patch-44 Putnam3145 2021-10-11 15:51:33 -07:00
  • f3e7929cb4 Merge pull request #15230 from Putnam3145/auxmos-update silicons 2021-10-11 15:50:03 -07:00
  • 5680b74294 safety DeltaFire 2021-10-11 20:32:00 +02:00
  • 66e81e7fda asay ping time DeltaFire 2021-10-11 19:52:30 +02:00
  • 41b9ef2180 Automatic changelog compile [ci skip] Changelogs 2021-10-11 00:28:25 +00:00
  • 24ce9d4de7 oopsy missed a brig wall near maint dapnee 2021-10-10 17:42:37 -06:00
  • de678585f0 Moves Pubby Court and Adds the BEPIS to Science dapnee 2021-10-10 17:29:14 -06:00
  • 11df2bb77c fixes emps not working on lockers (#15259) Timothy Teakettle 2021-10-10 23:48:00 +01:00
  • e83f53c423 Update DeltaStation2.dmm MrJWhit 2021-10-10 16:25:42 -04:00
  • 58f4a0f7b9 Trash and Fire to a box MrJWhit 2021-10-10 16:07:55 -04:00
  • 84c6970c27 Merge pull request #15250 from SandPoot/you-are-now-rate-limited silicons 2021-10-09 22:14:45 -07:00
  • 7c311f9730 Merge pull request #15251 from UncleBourbon/i-love-coding silicons 2021-10-09 22:14:26 -07:00
  • 0e92551e51 Merge branch 'master' into pirate10k keronshb 2021-10-09 11:58:55 -04:00
  • b9ed852438 Merge remote-tracking branch 'upstream/master' keronshb 2021-10-09 11:58:24 -04:00
  • 2085279590 Merge pull request #15252 from SandPoot/tooltip-related-fixes Lin 2021-10-08 22:31:23 -07:00
  • 1c754b814e Pirates pay raise documented keronshb 2021-10-09 00:47:16 -04:00
  • beab6771bb Merge remote-tracking branch 'upstream/master' keronshb 2021-10-09 00:29:13 -04:00
  • fce4eb0476 Merge branch 'dynamicport' keronshb 2021-10-09 00:28:30 -04:00
  • a7fe6f0cfd Merge pull request #15255 from Hatterhat/saiga-fix silicons 2021-10-08 20:57:30 -07:00
  • 8cec112f65 Merge pull request #15257 from DeltaFire15/undocumented-pirate-revert silicons 2021-10-08 20:50:48 -07:00
  • 88836ea499 Automatic changelog compile [ci skip] Changelogs 2021-10-09 00:25:57 +00:00
  • 437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not SandPoot 2021-10-08 21:05:41 -03:00
  • c5476daeec revert DeltaFire 2021-10-08 23:51:34 +02:00
  • 562c714a1e Fixes the north sprite keronshb 2021-10-08 17:36:27 -04:00
  • e5f66413c8 fat dart keronshb 2021-10-08 17:28:25 -04:00
  • 20087a06a8 superglued stock Hatterhat 2021-10-08 00:15:35 -05:00
  • de51455fac Dynamic extended rewrite: some antags Putnam3145 2021-10-07 20:50:45 -07:00
  • ea4401940d Merge remote-tracking branch 'upstream/master' keronshb 2021-10-07 21:52:51 -04:00
  • 3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport Putnam3145 2021-10-07 18:14:59 -07:00
  • c7b57109c7 wip dnm Hatterhat 2021-10-07 16:42:03 -05:00
  • b92226be17 Merge pull request #15245 from Putnam3145/fix-ashwalkers-one-last-time Lin 2021-10-07 11:44:47 -07:00
  • db0e331d45 Merge pull request #15225 from silicons/admin_ahelp_irc Lin 2021-10-07 11:40:33 -07:00
  • 5c562959a9 Allows midround budget to be spent in extended keronshb 2021-10-07 14:12:37 -04:00
  • f77ff24a6f Update tacklers.dm SandPoot 2021-10-07 12:59:25 -03:00
  • 3de08a74e7 Upload files SandPoot 2021-10-07 12:32:20 -03:00
  • 9805224ede adds neo kanji language Cazz 2021-10-07 02:53:08 -05:00
  • fedf409a5d Merge pull request #15105 from Citadel-Station-13/silicons-patch-7 Putnam3145 2021-10-07 00:05:45 -07:00
  • 8be5dba86a Merge pull request #15127 from Citadel-Station-13/silicons-patch-14 Putnam3145 2021-10-07 00:05:24 -07:00
  • ac84eed0d1 Merge pull request #15129 from Citadel-Station-13/silicons-patch-15 Putnam3145 2021-10-07 00:05:06 -07:00
  • 6cb639638e Automatic changelog compile [ci skip] Changelogs 2021-10-07 00:27:18 +00:00
  • e88368cd4c Update fail2topic.dm SandPoot 2021-10-06 16:27:06 -03:00
  • 39e63d5ac8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 SandPoot 2021-10-06 14:49:27 -03:00
  • 5451e5d4d7 Space Dragon gust no longer hardstuns. (#15243) keronshb 2021-10-06 11:30:13 -04:00
  • d1611ddf42 Lavaland ruin rad storm fix (#15242) Chayse Ramsay 2021-10-06 16:28:29 +01:00
  • 383f4423ac Why can't xenos eat rats and stuff. This fixes that. (#15227) Tupinambis 2021-10-06 10:19:59 -05:00
  • 76fa85e683 Cyborg module sorting fixed (#15241) Chayse Ramsay 2021-10-06 16:16:10 +01:00
  • dad0f5c207 Merge branch 'master' into silicons-patch-1 silicons 2021-10-06 07:21:45 -07:00
  • 8070df6492 whoops Putnam3145 2021-10-05 19:07:52 -07:00
  • fa4f6dc612 Automatic changelog compile [ci skip] Changelogs 2021-10-06 00:27:55 +00:00
  • 3f50e836cc Merge pull request #15238 from DeltaFire15/nanitedefibs Lin 2021-10-05 16:25:59 -07:00
  • 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this SandPoot 2021-10-05 18:10:32 -03:00
  • 8f9a2b6d0c Merge pull request #15235 from silicons/pai_radio_Stuff Lin 2021-10-05 12:32:23 -07:00
  • 88db62f03f Merge pull request #15239 from jakeramsay007/7.12x82mm-Fix Lin 2021-10-05 12:21:10 -07:00
  • 1b8c72285f Merge pull request #15236 from silicons/decon Lin 2021-10-05 12:14:00 -07:00
  • 526e771e27 Merge pull request #15240 from jakeramsay007/Fix-15193 Lin 2021-10-05 12:12:51 -07:00
  • 73d6266f89 fix (#15248) silicons 2021-10-05 10:42:26 -07:00
  • b18fbe695a Merge pull request #15233 from SandPoot/misc-fixes Lin 2021-10-05 10:27:19 -07:00
  • d10fa48e29 Merge pull request #15237 from DeltaFire15/phobia-redtext Lin 2021-10-05 10:22:17 -07:00
  • 59f33198f1 Revert "sync" SandPoot 2021-10-05 13:03:30 -03:00
  • 51f85c58a4 One last ashwalker fix Putnam3145 2021-10-04 20:56:08 -07:00
  • bbe32fa38a Upload files SandPoot 2021-10-05 00:33:49 -03:00
  • 4d2e81d73c newline Chayse Ramsay 2021-10-05 02:52:50 +01:00
  • ad33fe9742 Merge remote-tracking branch 'upstream/master' keronshb 2021-10-04 21:41:54 -04:00
  • a2e066a9f6 Automatic changelog compile [ci skip] Changelogs 2021-10-05 00:28:07 +00:00
  • 2de686f4d6 sync SandPoot 2021-10-04 21:25:03 -03:00
  • e642bfc3c7 Update surgery.dmi Chayse Ramsay 2021-10-04 19:25:55 +01:00
  • 6f0722ab48 Ammo box sprite fixed Chayse Ramsay 2021-10-04 18:36:17 +01:00
  • 97eb42b35b defib policy hook & oxyheal DeltaFire 2021-10-04 15:49:12 +02:00
  • cd570be827 woo DeltaFire 2021-10-04 15:03:56 +02:00
  • 121dcf4d55 Automatic changelog compile [ci skip] Changelogs 2021-10-04 00:29:36 +00:00
  • f5e52f810d I HATE YOU silicons 2021-10-03 13:54:58 -07:00
  • 715251dea1 wack silicons 2021-10-03 13:25:30 -07:00
  • 6f58f18cef thank you wanderingfox silicons 2021-10-03 13:18:20 -07:00
  • bac7bc3fb6 fix silicons 2021-10-03 11:29:32 -07:00
  • f024318810 Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul silicons 2021-10-03 11:20:55 -07:00
  • 31467420d7 Merge pull request #15221 from SandPoot/colormate silicons 2021-10-03 08:51:51 -07:00
  • 887e79aaf0 Update Colormate.js SandPoot 2021-10-02 23:00:16 -03:00