Commit Graph

  • 82d378c3f9 Changes the trauma formula so constant small ticks don't keep triggering traumas CitadelStationBot 2018-05-01 09:56:39 -05:00
  • 453bd38ca5 Merge pull request #37516 from XDTM/LinearBrainDamage Jordan Brown 2018-05-01 10:56:18 -04:00
  • 34321883cc Fix placing boxes in storage implants Tad Hardesty 2018-05-01 05:29:41 -07:00
  • 7add247144 Merge pull request #6592 from Citadel-Station-13/upstream-merge-37554 LetterJay 2018-04-30 22:37:37 -05:00
  • 154ab5022b Merge pull request #6576 from Citadel-Station-13/upstream-merge-37564 LetterJay 2018-04-30 22:34:53 -05:00
  • 54afa1f3e0 Revert "fixes a pacifism kill through crushing firelocks! (#37511)" CitadelStationBot 2018-04-30 21:20:43 -05:00
  • a3ca01f158 Merge pull request #37593 from optimumtact/revertarmshit Jordan Brown 2018-04-30 22:20:52 -04:00
  • 7e031ea0b4 Fixes mapping issue on deltastation CitadelStationBot 2018-04-30 21:20:35 -05:00
  • 8dd48870c1 Merge pull request #37570 from BuffEngineering/WestSolars Jordan Brown 2018-04-30 22:21:27 -04:00
  • fd136628c7 Fix runtimes in corpse code due to mob_spawners becoming null CitadelStationBot 2018-04-30 21:19:22 -05:00
  • d9c368a2a4 Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes Jordan Brown 2018-04-30 22:19:26 -04:00
  • 9127702237 Fix mecha maintenance protocol button always saying Initiate CitadelStationBot 2018-04-30 21:19:14 -05:00
  • 63e03413b2 Merge pull request #37560 from AutomaticFrenzy/patch/terminate-maintenace-protocols Jordan Brown 2018-04-30 22:19:45 -04:00
  • 357efecee0 Fixes loading custom aways. CitadelStationBot 2018-04-30 21:19:05 -05:00
  • da2ea729ee Merge pull request #37561 from AnturK/customloadingfix Jordan Brown 2018-04-30 22:19:59 -04:00
  • 1675490652 Modifies component transfer to make ChangeTurf able to transfer components Jordan Brown 2018-04-30 22:16:47 -04:00
  • 9a27c8568f Removes enriched uranium CitadelStationBot 2018-04-30 21:15:35 -05:00
  • c4d461f3be Merge pull request #37568 from pigeonsk/removeenruranium Jordan Brown 2018-04-30 22:16:02 -04:00
  • 02412ca7d7 Fixes the intergalactic stock market crash by removing the speculation/performance modifier CitadelStationBot 2018-04-30 21:14:22 -05:00
  • c869ad12bd Merge pull request #37572 from deathride58/fixesdepression Jordan Brown 2018-04-30 22:14:51 -04:00
  • 6f6cd9b92a Makes dizziness work again CitadelStationBot 2018-04-30 13:38:13 -05:00
  • 90ecbf6bb9 Makes dizziness work again Alomga 2018-04-30 20:38:37 +02:00
  • 9b6c3f5da2 Circuits can't throw themselves CitadelStationBot 2018-04-30 13:04:20 -05:00
  • 9c9b2feefc Merge pull request #37510 from JJRcop/throw_myself Jordan Brown 2018-04-30 14:05:01 -04:00
  • 43d29006dc Adds traits for a character's preference towards pineapples. CitadelStationBot 2018-04-30 13:02:05 -05:00
  • 12eb6a8a97 Merge pull request #37513 from ShizCalev/pineapple-memes Jordan Brown 2018-04-30 14:02:59 -04:00
  • 1ed2c6cddf Resolved var name conflict for bounce_away() CitadelStationBot 2018-04-30 12:51:40 -05:00
  • a9d452a24d Merge pull request #37549 from ShizCalev/bounce_away-fixes Jordan Brown 2018-04-30 13:52:52 -04:00
  • 22ec020158 More holosigns for techwebs CitadelStationBot 2018-04-30 12:48:12 -05:00
  • bf0fe93f35 Merge pull request #37556 from 81Denton/techweb-sunglasses Jordan Brown 2018-04-30 13:48:23 -04:00
  • 15e82029ef Adds some more reagents to clogged vents CitadelStationBot 2018-04-30 12:46:59 -05:00
  • 8f1bb462ad Merge pull request #37554 from DaxDupont/vents Jordan Brown 2018-04-30 13:47:37 -04:00
  • 7205a15ef7 Merge pull request #6591 from Citadel-Station-13/upstream-merge-37577 LetterJay 2018-04-30 11:06:19 -05:00
  • 94bebc33a0 Merge pull request #6590 from Citadel-Station-13/upstream-merge-37494 LetterJay 2018-04-30 11:03:33 -05:00
  • 34ce5380d6 Merge pull request #6589 from Citadel-Station-13/upstream-merge-37500 LetterJay 2018-04-30 11:03:16 -05:00
  • 372e363257 Merge pull request #6588 from Citadel-Station-13/upstream-merge-37437 LetterJay 2018-04-30 11:02:58 -05:00
  • a082da66f3 Merge pull request #6587 from Citadel-Station-13/upstream-merge-37499 LetterJay 2018-04-30 11:02:36 -05:00
  • fcb1261c13 Merge pull request #6586 from Citadel-Station-13/upstream-merge-37503 LetterJay 2018-04-30 11:02:16 -05:00
  • 6885655022 Merge pull request #6585 from Citadel-Station-13/upstream-merge-37544 LetterJay 2018-04-30 10:21:06 -05:00
  • 794d078dff Merge pull request #6584 from Citadel-Station-13/upstream-merge-37489 LetterJay 2018-04-30 10:20:53 -05:00
  • b493bfe89f Merge pull request #6582 from Citadel-Station-13/upstream-merge-37496 LetterJay 2018-04-30 10:11:54 -05:00
  • e2ef2ee0f3 Merge pull request #6583 from Citadel-Station-13/upstream-merge-37498 LetterJay 2018-04-30 09:43:13 -05:00
  • 4955bb35aa Merge pull request #6581 from Citadel-Station-13/upstream-merge-37547 LetterJay 2018-04-30 09:42:33 -05:00
  • 9bb7ec6bf3 Merge pull request #6580 from Citadel-Station-13/upstream-merge-37481 LetterJay 2018-04-30 09:42:21 -05:00
  • 6672d8856e Merge pull request #6579 from Citadel-Station-13/upstream-merge-37422 LetterJay 2018-04-30 09:42:06 -05:00
  • dc5a3da4d8 Merge pull request #6578 from Citadel-Station-13/upstream-merge-37509 LetterJay 2018-04-30 09:41:50 -05:00
  • b30dfd9133 Removes a duplicate comsig I accidently added CitadelStationBot 2018-04-30 09:32:58 -05:00
  • 3fc7b4ca3b Merge pull request #37577 from kevinz000/patch-495 vuonojenmustaturska 2018-04-30 17:33:25 +03:00
  • 6eeca8466a [s] Small tweaks and fixes a edgecase with machine construction CitadelStationBot 2018-04-30 05:00:25 -05:00
  • 987cce76ed [s] Small tweaks and fixes a edgecase with machine construction (#37494) Jalleo 2018-04-30 11:01:43 +01:00
  • 694dd1a64e Removed /obj/item/asteroid path CitadelStationBot 2018-04-30 04:57:09 -05:00
  • 3160d7771d Removed /obj/item/asteroid path (#37500) ShizCalev 2018-04-30 05:57:36 -04:00
  • 55b8c84807 Fixes circuits being able to detect ghosts and fix pinless guns CitadelStationBot 2018-04-30 04:55:55 -05:00
  • 7feea76eee Fixes circuits being able to detect ghosts and fix pinless guns (#37437) kevinz000 2018-04-30 02:56:18 -07:00
  • 324168c39f Fixes bikehorn mood event CitadelStationBot 2018-04-30 04:55:47 -05:00
  • 665bd35f78 Merge pull request #37499 from ShizCalev/bikehorn-fix vuonojenmustaturska 2018-04-30 12:57:05 +03:00
  • ea8fc86272 Fixes Blast Cannon CitadelStationBot 2018-04-30 04:53:33 -05:00
  • e2328a122e Fixes Blast Cannon (#37503) Fox McCloud 2018-04-30 05:53:59 -04:00
  • 51c102ddd8 Adds a 2.5 second fire delay to beam rifles CitadelStationBot 2018-04-30 04:53:21 -05:00
  • 3ba3d5fb5e beam rifle delay (#37544) kevinz000 2018-04-30 02:54:25 -07:00
  • 14a10492af [s] Fixes the fryer shrinking the size of objects CitadelStationBot 2018-04-30 04:52:09 -05:00
  • 948f34406a [s] Fixes the fryer shrinking the size of objects (#37489) ShizCalev 2018-04-30 05:52:46 -04:00
  • c2ca8e8bf3 Fixes glass stack explosion act CitadelStationBot 2018-04-30 04:50:56 -05:00
  • 5adabb4b91 Fixes glass stack explosion act (#37498) ShizCalev 2018-04-30 05:52:11 -04:00
  • 7b0975cddc IC weapon mechanism only works when assembly is on turf CitadelStationBot 2018-04-30 01:31:06 -05:00
  • 6df3ffcddf IC weapons only works on turfs (#37496) Evsey Antonovich 2018-04-30 11:32:34 +05:00
  • f1f86fc895 fixes teleprod inhands CitadelStationBot 2018-04-30 01:16:39 -05:00
  • 4a7ee96b76 fixes teleprod inhands (#37547) Trevor Serpas 2018-04-30 01:17:41 -05:00
  • afb9ae7f2f Readds BZ Cannisters for Xenobiology CitadelStationBot 2018-04-30 01:12:23 -05:00
  • 8bb3a4ec75 Readds BZ Cannisters for Xenobiology (#37481) YakumoChen 2018-04-30 06:13:31 +00:00
  • cdae634c0e Adds a cooldown to PDA send to all messages. CitadelStationBot 2018-04-30 01:08:03 -05:00
  • a705b2c31c Adds a cooldown to PDA send to all messages. (#37422) Dax Dupont 2018-04-30 08:09:10 +02:00
  • 13de05725a Makes nutrition level show up on self-inspect CitadelStationBot 2018-04-30 00:17:59 -05:00
  • 01e4304326 Makes nutrition level show up on self-inspect (#37509) Mickyan 2018-04-30 07:19:20 +02:00
  • 3369c804b2 Kills off /obj/item/device (#6561) kevinz000 2018-04-29 22:06:58 -07:00
  • 0a02d1cb13 Deactivate suicide prescans via ghost var george99g 2018-04-30 05:35:00 +03:00
  • dbd62d2703 Actually links mineral sprites with their new location CitadelStationBot 2018-04-29 19:06:14 -05:00
  • 07bbc4d3af Actually links mineral sprites with their new location (#37564) pigeons 2018-04-29 20:07:47 -04:00
  • ab3035a4ea Update .travis.yml LetterJay 2018-04-29 18:58:35 -05:00
  • 815e396f0c Adds fly and moth categories to limb grower CitadelStationBot 2018-04-29 17:52:44 -05:00
  • 2ca75d7de7 added fly and moth categories to limb grower and limbgrower_designs.dm (#37349) erwgd 2018-04-29 23:53:42 +01:00
  • b7cdd6a7fd Update networks.dm deathride58 2018-04-29 18:48:26 -04:00
  • c6b888d6b2 Update panels.css deathride58 2018-04-29 18:46:08 -04:00
  • 6f13d2c2e9 Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380 deathride58 2018-04-29 22:45:28 +00:00
  • adf349db02 Update spiders.dm deathride58 2018-04-29 18:44:31 -04:00
  • 9d33974316 Update absorb.dm deathride58 2018-04-29 18:44:14 -04:00
  • c075dbfe81 Update changeling_power.dm deathride58 2018-04-29 18:43:52 -04:00
  • f46a77ba5c Update charged.dm deathride58 2018-04-29 18:43:11 -04:00
  • 3921590a4b Update life.dm deathride58 2018-04-29 18:42:17 -04:00
  • e03e419b9e Update life.dm deathride58 2018-04-29 18:41:01 -04:00
  • 2890cfb978 Update mutations.dm deathride58 2018-04-29 18:37:51 -04:00
  • b3b84b3dda Update flags.dm deathride58 2018-04-29 18:36:49 -04:00
  • ec2de88a65 Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use vuonojenmustaturska 2018-04-30 01:32:59 +03:00
  • e66e348d5c Merge pull request #6572 from Citadel-Station-13/upstream-merge-37535 deathride58 2018-04-29 22:33:37 +00:00
  • 41e4851500 Merge pull request #6569 from Citadel-Station-13/upstream-merge-37559 deathride58 2018-04-29 22:33:07 +00:00
  • f373b2c9e6 Kills off three more flags from flags_2 vuonojenmustaturska 2018-04-30 01:32:23 +03:00
  • 483bcc66d5 Merge pull request #6563 from Citadel-Station-13/upstream-merge-37485 deathride58 2018-04-29 22:30:41 +00:00
  • 6ae31ccf69 Merge pull request #6564 from Citadel-Station-13/upstream-merge-37514 deathride58 2018-04-29 22:30:12 +00:00
  • 7c27c97256 Merge pull request #6567 from Citadel-Station-13/upstream-merge-37511 deathride58 2018-04-29 22:29:44 +00:00
  • a966874bed Merge pull request #6568 from Citadel-Station-13/upstream-merge-37506 deathride58 2018-04-29 22:29:12 +00:00