Commit Graph

42567 Commits

Author SHA1 Message Date
CitadelStationBot 57da565e68 Automatic changelog generation for PR #14617 [ci skip] 2021-04-18 19:51:03 -05:00
silicons 757db58ef5 Merge pull request #14617 from keronshb/dragnetadjust
CONSITENCY: Matches Dragnet breakout time to Energy Bolas
2021-04-18 18:51:01 -06:00
CitadelStationBot 11a130bac5 Automatic changelog generation for PR #14608 [ci skip] 2021-04-18 19:50:39 -05:00
silicons 9f032df236 Merge pull request #14608 from TheObserver-sys/TheHoldoutUpdate
The Holdout Update: How I learned to stop whining, and aim a pocket pistol.
2021-04-18 18:50:37 -06:00
CitadelStationBot bc7ff72188 Automatic changelog generation for PR #14613 [ci skip] 2021-04-18 19:50:30 -05:00
silicons 3b08587cf1 Merge pull request #14613 from HeroWithYay/Bottle
New Bottle Sprites
2021-04-18 18:50:28 -06:00
silicons cd9ccb82d7 Merge pull request #14594 from DrPainis/patch-7
Makes insect blood not look like diarrhea.
2021-04-18 18:49:43 -06:00
CitadelStationBot 85356e413b Automatic changelog generation for PR #14603 [ci skip] 2021-04-18 19:49:31 -05:00
silicons e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
CitadelStationBot f6b2ec0215 Automatic changelog generation for PR #14591 [ci skip] 2021-04-18 19:48:10 -05:00
silicons 02f4bd8f3a Merge pull request #14591 from zeroisthebiggay/deathrattles
ports deathrattle implants but without mob statchange because i am not gonna port that today
2021-04-18 18:48:08 -06:00
silicons 791f2bb746 Merge pull request #14592 from zeroisthebiggay/patch-8
ports "Allow Revenants to read deadchat" from TG
2021-04-18 18:48:01 -06:00
CitadelStationBot 7e02a02d1e Automatic changelog generation for PR #14584 [ci skip] 2021-04-18 19:47:43 -05:00
silicons 2e8d9f2ab7 Merge pull request #14584 from zeroisthebiggay/n
deletes box ghost burger
2021-04-18 18:47:41 -06:00
Changelogs 4e177df13d Automatic changelog compile [ci skip] 2021-04-19 00:06:56 +00:00
Lin 8f578552ea Merge pull request #14626 from Citadel-Station-13/losing_my_shit
(i swear this is not due to anyone in particular unironically) fixes heretic not being on jobban panel because every other coder was too busy to for 6 months
2021-04-18 17:51:16 +00:00
silicons 52a4a5a042 nothing to see here folks 2021-04-18 08:29:51 -07:00
The0bserver 34e6a179ad By popular request 2021-04-17 21:29:19 -04:00
Changelogs 3302d38829 Automatic changelog compile [ci skip] 2021-04-18 00:06:27 +00:00
silicons 9d4a9a6677 Update functions.dm 2021-04-17 16:22:13 -07:00
silicons bb50a4f160 Update topic.dm 2021-04-17 16:21:33 -07:00
CitadelStationBot 9208287e3d Automatic changelog generation for PR #14606 [ci skip] 2021-04-17 18:00:51 -05:00
silicons 30fd90a87c Merge pull request #14606 from SandPoot/cloning-machine-tgui
TGUIZES the cloning computer
2021-04-17 17:00:49 -06:00
CitadelStationBot aae60d0876 Automatic changelog generation for PR #14599 [ci skip] 2021-04-17 18:00:39 -05:00
silicons 6a181610a9 Merge pull request #14599 from BlueWildrose/revenantevil
Revenant changes port from TG - revenants no longer spend their current essence to unlock new abilities; a fix
2021-04-17 17:00:36 -06:00
CitadelStationBot 1a651a6b65 Automatic changelog generation for PR #14622 [ci skip] 2021-04-17 16:07:07 -05:00
Lin ab12adaf28 Merge pull request #14622 from DeltaFire15/heal-surgery-oops
Fixes organic repair surgeries showing for targets without any organic bodyparts
2021-04-17 16:07:05 -05:00
CitadelStationBot fa141ac259 Automatic changelog generation for PR #14616 [ci skip] 2021-04-17 16:00:54 -05:00
Lin b60c1b01e3 Merge pull request #14616 from DeltaFire15/mecha-emp-WHAT
Fixes an unintentional buff to EMPs when used against mechs (related to the drain amount formula)
2021-04-17 16:00:52 -05:00
Changelogs 16b6a617fd Automatic changelog compile [ci skip] 2021-04-17 00:06:20 +00:00
SandPoot 7f097182e8 OperatingComputer.js (#14611) 2021-04-16 18:01:51 +02:00
DeltaFire d4d9fef82c oop 2021-04-16 16:06:34 +02:00
keronshb 77806ad216 Adjusts Dragnet to match Ebola
Consistency
2021-04-15 20:58:30 -04:00
Changelogs 09b06757fa Automatic changelog compile [ci skip] 2021-04-16 00:05:54 +00:00
DeltaFire 9e88139433 no 2021-04-16 01:07:46 +02:00
HeroWithYay a759aae2fb re-adds hypovial80 and bluespace80 2021-04-15 18:14:00 +12:00
CitadelStationBot 88a90f547d Automatic changelog generation for PR #14605 [ci skip] 2021-04-14 21:39:35 -05:00
Lin e07854f3c3 Merge pull request #14605 from DeltaFire15/tank-dispensers
Fixes tank dispensers being unusable by borgs
2021-04-14 21:39:33 -05:00
CitadelStationBot 1450bd4092 Automatic changelog generation for PR #14602 [ci skip] 2021-04-14 21:39:09 -05:00
Lin f3ea2d58dc Merge pull request #14602 from BlueWildrose/YoHoYoHofuckoff
Pirate related fixes and communication console fixes
2021-04-14 21:39:06 -05:00
Changelogs 306cf696ea Automatic changelog compile [ci skip] 2021-04-15 00:06:58 +00:00
HeroWithYay 65d6be40fb Botttle 2021-04-15 06:01:26 +12:00
HeroWithYay 7a472c16eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-15 05:42:26 +12:00
CitadelStationBot 4d797ab694 Automatic changelog generation for PR #14609 [ci skip] 2021-04-14 08:10:07 -05:00
BlueWildrose 72c377d72c Fixes pods not returning to Centcomm (#14609) 2021-04-14 15:10:04 +02:00
CitadelStationBot 20ac90a9db Automatic changelog generation for PR #14601 [ci skip] 2021-04-14 07:06:03 -05:00
skodai 275a946031 Update food.dmi (#14601) 2021-04-14 14:06:00 +02:00
The0bserver 10b00932a3 This space left intentionally blank 2021-04-14 02:10:12 -04:00
The0bserver 6be351ecb6 I will try this. 2021-04-14 01:48:18 -04:00
The0bserver c313ba38b8 adds the .38 2021-04-14 01:26:24 -04:00